[All -> All] Code cleanup.

Source/SammBot.Library/Constants.cs

@@ -17,7 +17,6 @@
 #endregion
 
 using Discord;
-using System.Diagnostics;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 

Source/SammBot.Tests/Extensions/ObjectExtensionsTests.cs

@@ -35,11 +35,13 @@ public void ToQueryStringTest()
     }
 }
 
+// ReSharper disable UnusedMember.Local
 file class TestClass
 {
     [UglyName("testString")] 
     public string TestString { get; } = "hello!";
 
     [UglyName("testInt")] 
     public int TestInt { get; } = 2;
-}
+}
+// ReSharper restore UnusedMember.Local

Source/SammBot/Modules/FunModule.cs

@@ -137,7 +137,7 @@ public async Task<RuntimeResult> HugUserAsync
         SocketGuildUser targetUser
     )
     {
-        string chosenKaomoji = _settingsService.Settings.HugKaomojis.PickRandom();
+        string chosenKaomoji = _settingsService.Settings!.HugKaomojis.PickRandom();
 
         SocketGuildUser authorGuildUser = (Context.Interaction.User as SocketGuildUser)!;
 
@@ -195,7 +195,7 @@ SocketGuildUser targetUser
     {
         SocketGuildUser authorUser = (Context.Interaction.User as SocketGuildUser)!;
 
-        string chosenMessage = _settingsService.Settings.KillMessages.PickRandom();
+        string chosenMessage = _settingsService.Settings!.KillMessages.PickRandom();
         Dictionary<string, object?> template = new Dictionary<string, object?>()
         {
             ["murderer"] = Format.Bold(authorUser.DisplayName),
@@ -316,20 +316,20 @@ public async Task<RuntimeResult> ShipUsersAsync
             if (percentage < _shipSegments[i])
             {
                 if (i == 0)
-                    progressBar += _settingsService.Settings.ShipBarStartEmpty;
+                    progressBar += _settingsService.Settings!.ShipBarStartEmpty;
                 else if (i == _shipSegments.Length - 1)
-                    progressBar += _settingsService.Settings.ShipBarEndEmpty;
+                    progressBar += _settingsService.Settings!.ShipBarEndEmpty;
                 else
-                    progressBar += _settingsService.Settings.ShipBarHalfEmpty;
+                    progressBar += _settingsService.Settings!.ShipBarHalfEmpty;
             }
             else
             {
                 if (i == 0)
-                    progressBar += _settingsService.Settings.ShipBarStartFull;
+                    progressBar += _settingsService.Settings!.ShipBarStartFull;
                 else if (i == _shipSegments.Length - 1)
-                    progressBar += _settingsService.Settings.ShipBarEndFull;
+                    progressBar += _settingsService.Settings!.ShipBarEndFull;
                 else
-                    progressBar += _settingsService.Settings.ShipBarHalfFull;
+                    progressBar += _settingsService.Settings!.ShipBarHalfFull;
             }
         }
 

Source/SammBot/Modules/UserTagsModule.cs

@@ -128,7 +128,7 @@ public async Task<RuntimeResult> SearchTagsAsync
         using (DatabaseService databaseService = new DatabaseService())
         {
             List<UserTag> allTags = await databaseService.UserTags.Where(x => x.GuildId == Context.Guild.Id).ToListAsync();
-            List<UserTag> filteredTags = allTags.Where(x => searchTerm.DamerauDistance(x.Name, _settingsService.Settings.TagDistance) < int.MaxValue).Take(25).ToList();
+            List<UserTag> filteredTags = allTags.Where(x => searchTerm.DamerauDistance(x.Name, _settingsService.Settings!.TagDistance) < int.MaxValue).Take(25).ToList();
 
             if (!filteredTags.Any())
                 return ExecutionResult.FromError($"No tags found with a name similar to \"{searchTerm}\".");

Source/SammBot/Modules/UtilsModule.cs

@@ -19,17 +19,14 @@
 using Discord;
 using Discord.Interactions;
 using Discord.WebSocket;
-using Microsoft.Extensions.DependencyInjection;
 using SammBot.Library;
 using SammBot.Library.Attributes;
 using SammBot.Library.Extensions;
 using SammBot.Library.Models;
 using SammBot.Library.Preconditions;
 using SkiaSharp;
-using System;
 using System.IO;
 using System.Threading.Tasks;
-using SammBot.Services;
 
 namespace SammBot.Modules;
 
@@ -38,15 +35,6 @@ namespace SammBot.Modules;
 [ModuleEmoji("\U0001f527")]
 public class UtilsModule : InteractionModuleBase<ShardedInteractionContext>
 {
-    private readonly HttpService _httpService;
-    private readonly SettingsService _settingsService;
-
-    public UtilsModule(IServiceProvider provider)
-    {
-        _httpService = provider.GetRequiredService<HttpService>();
-        _settingsService = provider.GetRequiredService<SettingsService>();
-    }
-
     [SlashCommand("viewhex", "Displays a HEX color, and converts it in other formats.")]
     [DetailedDescription("Sends an image with the provided color as background, and a piece of text with the color written in the middle. " +
                          "Also converts it to RGB, CMYK, HSV and HSL.")]

Source/SammBot/Services/CommandService.cs

@@ -124,7 +124,7 @@ private async Task HandleInteractionAsync(SocketInteraction interaction)
     {
         ShardedInteractionContext context = new ShardedInteractionContext(_shardedClient, interaction);
 
-        if (_settingsService.Settings.OnlyOwnerMode)
+        if (_settingsService.Settings!.OnlyOwnerMode)
         {
             IApplication botApplication = await _shardedClient.GetApplicationInfoAsync();
 
@@ -137,7 +137,7 @@ private async Task HandleInteractionAsync(SocketInteraction interaction)
             ["username"] = interaction.User.GetFullUsername(),
             ["channelname"] = interaction.Channel.Name
         };
-        string formattedLog = _settingsService.Settings.CommandLogFormat.TemplateReplace(template);
+        string formattedLog = _settingsService.Settings!.CommandLogFormat.TemplateReplace(template);
 
         await _logger.LogAsync(LogSeverity.Debug, formattedLog);
 #endif

Source/SammBot/Services/HttpService.cs

@@ -51,7 +51,7 @@ public HttpService(IServiceProvider services)
 
         SettingsService settingsService = services.GetRequiredService<SettingsService>();
 
-        _client.DefaultRequestHeaders.Add("User-Agent", settingsService.Settings.HttpUserAgent);
+        _client.DefaultRequestHeaders.Add("User-Agent", settingsService.Settings!.HttpUserAgent);
     }
 
     /// <summary>
@@ -118,7 +118,7 @@ public void UnregisterDomainQueue(string domain)
         }
 
         // This domain has a queue.
-        if (_queueDictionary.TryGetValue(uriBuilder.Host, out TaskQueue? queue) && queue != default)
+        if (_queueDictionary.TryGetValue(uriBuilder.Host, out TaskQueue? queue))
             return await queue.Enqueue(GetJsonRemote, CancellationToken.None);
 
         return await GetJsonRemote();

Source/SammBot/Services/RandomService.cs

@@ -40,7 +40,7 @@ public RandomService(IServiceProvider services)
     {
         SettingsService settingsService = services.GetRequiredService<SettingsService>();
 
-        CatRequester = new SharpCatRequester(settingsService.Settings.CatKey);
-        DogRequester = new SharpDogRequester(settingsService.Settings.DogKey);
+        CatRequester = new SharpCatRequester(settingsService.Settings!.CatKey);
+        DogRequester = new SharpDogRequester(settingsService.Settings!.DogKey);
     }
 }

Source/SammBot/Services/SettingsService.cs

@@ -17,7 +17,6 @@
 #endregion
 
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Text.Json;
 using SammBot.Library;

Source/SammBot/Services/StartupService.cs

@@ -88,7 +88,7 @@ public StartupService(IServiceProvider services)
     public async Task StartAsync()
     {
         await _logger.LogAsync(LogSeverity.Information, "Logging in as a bot...");
-        await _shardedClient.LoginAsync(TokenType.Bot, _settingsService.Settings.BotToken);
+        await _shardedClient.LoginAsync(TokenType.Bot, _settingsService.Settings!.BotToken);
         await _shardedClient.StartAsync();
         await _logger.LogAsync(LogSeverity.Success, "Succesfully connected to web socket.");
 
@@ -175,7 +175,7 @@ private async Task OnShardReady(DiscordSocketClient shardClient)
 
             if (_shardsReady == _shardedClient.Shards.Count)
             {
-                if (_settingsService.Settings.StatusList.Count > 0 && _settingsService.Settings.RotatingStatus)
+                if (_settingsService.Settings!.StatusList.Count > 0 && _settingsService.Settings.RotatingStatus)
                     _statusTimer = new Timer(RotateStatus, null, TimeSpan.Zero, TimeSpan.FromSeconds(20));
 
                 await _interactionService.RegisterCommandsGloballyAsync();
@@ -213,9 +213,9 @@ private async void RotateStatus(object? state)
     {
         try
         {
-            BotStatus chosenStatus = _settingsService.Settings.StatusList.PickRandom();
+            BotStatus chosenStatus = _settingsService.Settings!.StatusList.PickRandom();
             ActivityType gameType = chosenStatus.Type;
-            string? gameUrl = gameType == ActivityType.Streaming ? _settingsService.Settings.TwitchUrl : null;
+            string? gameUrl = gameType == ActivityType.Streaming ? _settingsService.Settings!.TwitchUrl : null;
 
             if (gameType == ActivityType.CustomStatus)
                 await _shardedClient.SetCustomStatusAsync(chosenStatus.Content);