Use SocketGuild rather than ulong guildId for EmbedFixer where possible

Author: gepbird

Commands/EmbedFixerCommand.cs

@@ -51,7 +51,7 @@ public override async Task Handle(SocketSlashCommand cmd)
 
   private async Task ListPatterns(SocketSlashCommand cmd, SocketGuild guild)
   {
-    var patterns = await service.GetPatternsFromCache(guild.Id);
+    var patterns = await service.GetPatternsFromCache(guild);
     if (patterns.Count == 0)
     {
       await cmd.RespondAsync($"{Emotes.ErrorEmote} There are no embed fixer patterns");

Commands/EmbedFixerHandler.cs

@@ -18,7 +18,7 @@ public async Task<bool> TryHandleMessage(SocketMessage message)
     var guild = (channel as SocketGuildChannel)!.Guild;
     var content = message.Content;
 
-    var fixedContent = await service.ReplaceLinks(guild.Id, content);
+    var fixedContent = await service.ReplaceLinks(guild, content);
 
     if (content == fixedContent)
     {

Models/EmbedFixerPattern.cs

@@ -1,5 +1,3 @@
-using Discord.WebSocket;
-
 namespace Moe.Models;
 
 public class EmbedFixerPattern

Services/EmbedFixerService.cs

@@ -38,9 +38,9 @@ public bool IsAuthorized(SocketGuildUser user, out string? error)
     return settingsService.IsAuthorized(user, ModrankLevel.Administrator, out error);
   }
 
-  public async Task<string> ReplaceLinks(ulong guildId, string input)
+  public async Task<string> ReplaceLinks(SocketGuild guild, string input)
   {
-    var patterns = await GetPatternsFromCache(guildId);
+    var patterns = await GetPatternsFromCache(guild);
     foreach (var pattern in patterns)
     {
       Regex regex = new Regex(pattern.Pattern);
@@ -50,32 +50,32 @@ public async Task<string> ReplaceLinks(ulong guildId, string input)
     return input;
   }
 
-  private async Task<List<EmbedFixerPattern>> GetPatterns(ulong guildId)
+  private async Task<List<EmbedFixerPattern>> GetPatterns(SocketGuild guild)
   {
     var sql = "SELECT pattern, replacement FROM embed_fixer WHERE guild_id = $0 AND pattern != $1";
-    var result = await DatabaseService.Query<string, string>(sql, guildId, initializedMagic);
+    var result = await DatabaseService.Query<string, string>(sql, guild.Id, initializedMagic);
     return result.ConvertAll(x => new EmbedFixerPattern()
     {
       Pattern = x.Item1!,
       Replacement = x.Item2!
     });
   }
 
-  public async Task<List<EmbedFixerPattern>> GetPatternsFromCache(ulong guildId)
+  public async Task<List<EmbedFixerPattern>> GetPatternsFromCache(SocketGuild guild)
   {
-    if (patternsCache.TryGetValue(guildId, out var patterns))
+    if (patternsCache.TryGetValue(guild.Id, out var patterns))
     {
       return patterns;
     }
 
-    var newPatterns = await GetPatterns(guildId);
-    patternsCache.Add(guildId, newPatterns);
+    var newPatterns = await GetPatterns(guild);
+    patternsCache.Add(guild.Id, newPatterns);
     return newPatterns;
   }
 
-  private void InvalidatePatternsCache(ulong guildId)
+  private void InvalidatePatternsCache(SocketGuild guild)
   {
-    patternsCache.Remove(guildId);
+    patternsCache.Remove(guild.Id);
   }
 
   private async Task InitializeDatabase()