Refactor WebApi Controllers to take advantage of new .net6 features

src/Web/ApiError.cs

@@ -1,7 +1,6 @@
-namespace Geekbot.Web
+namespace Geekbot.Web;
-{
+
-    public class ApiError
+public record ApiError
 {
     public string Message { get; set; }
 }
-}

src/Web/Controllers/Callback/CallbackController.cs

@@ -1,15 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Geekbot.Core.GlobalSettings;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Geekbot.Web.Controllers.Callback
+namespace Geekbot.Web.Controllers.Callback;
-{
+
-    public class CallbackController : Controller
+[ApiController]
+public class CallbackController : ControllerBase
 {
     private readonly IGlobalSettings _globalSettings;
 
@@ -44,11 +41,10 @@ namespace Geekbot.Web.Controllers.Callback
             result.EnsureSuccessStatusCode();
 
             var stringResponse = await result.Content.ReadAsStringAsync();
-                var responseData = JsonSerializer.Deserialize<CallbackTokenResponseDto>(stringResponse);
+            var responseData = JsonSerializer.Deserialize<CallbackTokenResponse>(stringResponse);
             token = responseData.AccessToken;
         }
 
         return new RedirectResult($"https://geekbot.pizzaandcoffee.rocks/login?token={token}", false);
     }
 }
-}

src/Web/Controllers/Callback/CallbackTokenResponse.cs

@@ -0,0 +1,21 @@
+using System.Text.Json.Serialization;
+
+namespace Geekbot.Web.Controllers.Callback;
+
+public record CallbackTokenResponse
+{
+    [JsonPropertyName("access_token")]
+    public string AccessToken { get; set; }
+
+    [JsonPropertyName("token_type")]
+    public string TokenType { get; set; }
+
+    [JsonPropertyName("expires_in")]
+    public int ExpiresIn { get; set; }
+
+    [JsonPropertyName("refresh_token")]
+    public string RefreshToken { get; set; }
+
+    [JsonPropertyName("scope")]
+    public string Scope { get; set; }
+}

src/Web/Controllers/Callback/CallbackTokenResponseDto.cs

@@ -1,22 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace Geekbot.Web.Controllers.Callback
-{
-    public class CallbackTokenResponseDto
-    {
-        [JsonPropertyName("access_token")]
-        public string AccessToken { get; set; }
-        
-        [JsonPropertyName("token_type")]
-        public string TokenType { get; set; }
-        
-        [JsonPropertyName("expires_in")]
-        public int ExpiresIn { get; set; }
-        
-        [JsonPropertyName("refresh_token")]
-        public string RefreshToken { get; set; }
-        
-        [JsonPropertyName("scope")]
-        public string Scope { get; set; }
-    }
-}

src/Web/Controllers/Commands/CommandController.cs

@@ -1,12 +1,12 @@
-using System.Linq;
+using Discord.Commands;
-using Discord.Commands;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Geekbot.Web.Controllers.Commands
+namespace Geekbot.Web.Controllers.Commands;
-{
+
+[ApiController]
 [EnableCors("AllowSpecificOrigin")]
-    public class CommandController : Controller
+public class CommandController : ControllerBase
 {
     private readonly CommandService _commands;
 
@@ -15,11 +15,11 @@ namespace Geekbot.Web.Controllers.Commands
         _commands = commands;
     }
 
-        [Route("/v1/commands")]
+    [HttpGet("/v1/commands")]
     public IActionResult GetCommands()
     {
         var commandList = (from cmd in _commands.Commands
-                let cmdParamsObj = cmd.Parameters.Select(cmdParam => new CommandParamDto
+            let cmdParamsObj = cmd.Parameters.Select(cmdParam => new ResponseCommandParam
                 {
                     Summary = cmdParam.Summary,
                     Default = cmdParam.DefaultValue?.ToString(),
@@ -27,7 +27,7 @@ namespace Geekbot.Web.Controllers.Commands
                 })
                 .ToList()
             let param = string.Join(", !", cmd.Aliases)
-                select new CommandDto
+            select new ResponseCommand
             {
                 Name = cmd.Name,
                 Summary = cmd.Summary,
@@ -38,4 +38,3 @@ namespace Geekbot.Web.Controllers.Commands
         return Ok(commandList.FindAll(e => !e.Aliases[0].StartsWith("owner")));
     }
 }
-}

src/Web/Controllers/Commands/CommandDto.cs

@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-
-namespace Geekbot.Web.Controllers.Commands
-{
-    public class CommandDto
-    {
-        public string Name { get; set; }
-        public string Summary { get; set; }
-        public bool IsAdminCommand { get; set; }
-        public List<string> Aliases { get; set; }
-        public List<CommandParamDto> Params { get; set; } 
-    }
-}

src/Web/Controllers/Commands/CommandParamDto.cs

@@ -1,9 +0,0 @@
-namespace Geekbot.Web.Controllers.Commands
-{
-    public class CommandParamDto
-    {
-        public string Summary { get; set; }
-        public string Default { get; set; }
-        public string Type { get; set; }
-    }
-}

src/Web/Controllers/Commands/ResponseCommand.cs

@@ -0,0 +1,10 @@
+namespace Geekbot.Web.Controllers.Commands;
+
+public record ResponseCommand
+{
+    public string Name { get; set; }
+    public string Summary { get; set; }
+    public bool IsAdminCommand { get; set; }
+    public List<string> Aliases { get; set; }
+    public List<ResponseCommandParam> Params { get; set; }
+}

src/Web/Controllers/Commands/ResponseCommandParam.cs

@@ -0,0 +1,8 @@
+namespace Geekbot.Web.Controllers.Commands;
+
+public record ResponseCommandParam
+{
+    public string Summary { get; set; }
+    public string Default { get; set; }
+    public string Type { get; set; }
+}

src/Web/Controllers/Highscores/HighscoreController.cs

@@ -1,12 +1,12 @@
-using System.Collections.Generic;
 using Geekbot.Core.Highscores;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Geekbot.Web.Controllers.Highscores
+namespace Geekbot.Web.Controllers.Highscores;
-{
+
+[ApiController]
 [EnableCors("AllowSpecificOrigin")]
-    public class HighscoreController : Controller
+public class HighscoreController : ControllerBase
 {
     private readonly IHighscoreManager _highscoreManager;
 
@@ -17,7 +17,7 @@ namespace Geekbot.Web.Controllers.Highscores
 
     [HttpPost]
     [Route("/v1/highscore")]
-        public IActionResult GetHighscores([FromBody] HighscoreControllerPostBodyDto body)
+    public IActionResult GetHighscores([FromBody] HighscoreControllerPostBody body)
     {
         if (!ModelState.IsValid || body == null)
         {
@@ -50,7 +50,7 @@ namespace Geekbot.Web.Controllers.Highscores
             });
             counter++;
         }
+
         return Ok(response);
     }
 }
-}

src/Web/Controllers/Highscores/HighscoreControllerPostBody.cs

@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations;
+using Geekbot.Core.Highscores;
+
+namespace Geekbot.Web.Controllers.Highscores;
+
+public record HighscoreControllerPostBody
+{
+    [Required]
+    public ulong GuildId { get; set; }
+
+    public HighscoreTypes Type { get; } = HighscoreTypes.messages;
+
+    [Range(1, 150)]
+    public int Amount { get; } = 50;
+}

src/Web/Controllers/Highscores/HighscoreControllerPostBodyDto.cs

@@ -1,16 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using Geekbot.Core.Highscores;
-
-namespace Geekbot.Web.Controllers.Highscores
-{
-    public class HighscoreControllerPostBodyDto
-    {
-        [Required]
-        public ulong GuildId { get; set; }
-        
-        public HighscoreTypes Type { get; } = HighscoreTypes.messages;
-        
-        [Range(1, 150)]
-        public int Amount { get; } = 50;
-    }
-}

src/Web/Controllers/Highscores/HighscoreControllerReponseBody.cs

@@ -1,11 +1,12 @@
 using Geekbot.Core.Highscores;
 
-namespace Geekbot.Web.Controllers.Highscores
+namespace Geekbot.Web.Controllers.Highscores;
-{
+
-    public class HighscoreControllerReponseBody
+public record HighscoreControllerReponseBody
 {
     public int rank { get; set; }
+
     public HighscoreUserDto user { get; set; }
+
     public int count { get; set; }
 }
-}

src/Web/Controllers/Interactions/InteractionController.cs

@@ -1,19 +1,16 @@
-using System;
-using System.IO;
 using System.Text;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Geekbot.Core.GlobalSettings;
 using Geekbot.Core.Interactions;
 using Geekbot.Core.Interactions.Request;
 using Geekbot.Core.Interactions.Response;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Sodium;
 
-namespace Geekbot.Web.Controllers.Interactions
+namespace Geekbot.Web.Controllers.Interactions;
-{
+
-    public class InteractionController : Controller
+[ApiController]
+public class InteractionController : ControllerBase
 {
     private readonly IInteractionCommandManager _interactionCommandManager;
     private readonly byte[] _publicKeyBytes;
@@ -28,8 +25,10 @@ namespace Geekbot.Web.Controllers.Interactions
     [HttpPost]
     [Route("/interactions")]
     public async Task<IActionResult> HandleInteraction(
-            [FromHeader(Name = "X-Signature-Ed25519")] string signature,
+        [FromHeader(Name = "X-Signature-Ed25519")]
-            [FromHeader(Name = "X-Signature-Timestamp")] string timestamp
+        string signature,
+        [FromHeader(Name = "X-Signature-Timestamp")]
+        string timestamp
     )
     {
         if (string.IsNullOrEmpty(signature) || string.IsNullOrEmpty(timestamp))
@@ -98,4 +97,3 @@ namespace Geekbot.Web.Controllers.Interactions
         return PublicKeyAuth.VerifyDetached(signatureBytes, timestampBytes, _publicKeyBytes);
     }
 }
-}

src/Web/Controllers/Interactions/InteractionRegistrarController.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Threading.Tasks;
 using Geekbot.Core;
 using Geekbot.Core.GlobalSettings;
 using Geekbot.Core.Interactions;
@@ -11,11 +6,11 @@ using Geekbot.Core.Interactions.ApplicationCommand;
 using Geekbot.Core.Logger;
 using Geekbot.Web.Controllers.Interactions.Model;
 using Microsoft.AspNetCore.Mvc;
-using Sentry.Protocol;
 
-namespace Geekbot.Web.Controllers.Interactions
+namespace Geekbot.Web.Controllers.Interactions;
-{
+
-    public class InteractionRegistrarController : Controller
+[ApiController]
+public class InteractionRegistrarController : ControllerBase
 {
     private readonly IGeekbotLogger _logger;
     private readonly IInteractionCommandManager _interactionCommandManager;
@@ -136,4 +131,3 @@ namespace Geekbot.Web.Controllers.Interactions
         return await HttpAbstractions.Get<List<RegisteredInteraction>>(_guildCommandUri, httpClient);
     }
 }
-}

src/Web/Controllers/Interactions/Model/InteractionRegistrationOperations.cs

@@ -1,12 +1,12 @@
-using System.Collections.Generic;
 using Geekbot.Core.Interactions.ApplicationCommand;
 
-namespace Geekbot.Web.Controllers.Interactions.Model
+namespace Geekbot.Web.Controllers.Interactions.Model;
-{
+
 public record InteractionRegistrationOperations
 {
     public List<Command> Create { get; set; } = new();
+
     public Dictionary<string, Command> Update { get; set; } = new();
+
     public List<string> Remove { get; set; } = new();
 }
-}

src/Web/Controllers/Interactions/Model/RegisteredInteraction.cs

@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
 using Geekbot.Core.Interactions.Request;
 
-namespace Geekbot.Web.Controllers.Interactions.Model
+namespace Geekbot.Web.Controllers.Interactions.Model;
-{
+
 public record RegisteredInteraction
 {
     [JsonPropertyName("id")]
@@ -29,4 +29,3 @@ namespace Geekbot.Web.Controllers.Interactions.Model
     [JsonPropertyName("guild_id")]
     public string GuildId { get; set; }
 }
-}

src/Web/Controllers/KillController.cs

@@ -1,12 +1,10 @@
-using System;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using Geekbot.Core;
 using Geekbot.Core.GlobalSettings;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Geekbot.Web.Controllers
+namespace Geekbot.Web.Controllers;
-{
+
 /*
  * Sometimes for some unknown reason command responses may become incredibly slow.
  * Because i don't have time to debug it and may not always know directly when it happens,
@@ -15,7 +13,9 @@ namespace Geekbot.Web.Controllers
  *
  * ToDo: Actually fix the underlying issue
  */
-    public class KillController : Controller
+
+[ApiController]
+public class KillController : ControllerBase
 {
     private readonly IGlobalSettings _globalSettings;
     private const string KillCodeDbKey = "KillCode";
@@ -61,4 +61,3 @@ namespace Geekbot.Web.Controllers
         Environment.Exit(GeekbotExitCode.KilledByApiCall.GetHashCode());
     }
 }
-}

src/Web/Controllers/Status/ApiStatus.cs

@@ -0,0 +1,10 @@
+namespace Geekbot.Web.Controllers.Status;
+
+public record ApiStatus
+{
+    public string GeekbotVersion { get; set; }
+
+    public string ApiVersion { get; set; }
+
+    public string Status { get; set; }
+}

src/Web/Controllers/Status/ApiStatusDto.cs

@@ -1,9 +0,0 @@
-namespace Geekbot.Web.Controllers.Status
-{
-    public class ApiStatusDto
-    {
-        public string GeekbotVersion { get; set; }
-        public string ApiVersion { get; set; }
-        public string Status { get; set; }
-    }
-}

src/Web/Controllers/Status/StatusController.cs

@@ -3,15 +3,16 @@ using Geekbot.Core;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Geekbot.Web.Controllers.Status
+namespace Geekbot.Web.Controllers.Status;
-{
+
+[ApiController]
 [EnableCors("AllowSpecificOrigin")]
-    public class StatusController : Controller
+public class StatusController : ControllerBase
 {
     [Route("/")]
     public IActionResult GetCommands()
     {
-            var responseBody = new ApiStatusDto
+        var responseBody = new ApiStatus
         {
             GeekbotVersion = Constants.BotVersion(),
             ApiVersion = Constants.ApiVersion.ToString(CultureInfo.InvariantCulture),
@@ -20,4 +21,3 @@ namespace Geekbot.Web.Controllers.Status
         return Ok(responseBody);
     }
 }
-}