Merge remote-tracking branch 'origin/dev'

fmbot-discord · Sep 24, 2024 · c19917e · c19917e
2 parents b34e64a + fc268f6
commit c19917e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/FMBot.Bot/Services/Guild/WebhookService.cs b/src/FMBot.Bot/Services/Guild/WebhookService.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Diagnostics.Eventing.Reader;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -97,10 +97,10 @@ public async Task<Webhook> CreateWebhook(ICommandContext context, int guildId)
 
     public async Task<bool> TestWebhook(Webhook webhook, string text)
     {
+        var webhookClient = new DiscordWebhookClient(webhook.DiscordWebhookId, webhook.Token);
+
         try
         {
-            var webhookClient = new DiscordWebhookClient(webhook.DiscordWebhookId, webhook.Token);
-
             await webhookClient.SendMessageAsync(text, threadId: webhook.DiscordThreadId);
 
             return true;
@@ -123,6 +123,10 @@ public async Task<bool> TestWebhook(Webhook webhook, string text)
 
             return false;
         }
+        finally
+        {
+            webhookClient.Dispose();
+        }
     }
 
     public async Task SendFeaturedWebhooks(FeaturedLog featured)
@@ -136,10 +140,14 @@ public async Task SendFeaturedWebhooks(FeaturedLog featured)
             .AsQueryable()
             .ToListAsync();
 
+        var tasks = new List<Task>();
         foreach (var webhook in webhooks)
         {
-            await SendWebhookEmbed(webhook, embed, featured.UserId);
+            tasks.Add(SendWebhookEmbed(webhook, embed, featured.UserId));
         }
+
+        Log.Information("SendFeaturedWebhooks: Sending {webhookCount} featured webhooks", webhooks.Count);
+        await Task.WhenAll(tasks);
     }
 
     public async Task SendFeaturedPreview(FeaturedLog featured, string webhook)

diff --git a/src/FMBot.Bot/Services/TimerService.cs b/src/FMBot.Bot/Services/TimerService.cs
@@ -465,12 +465,13 @@ public async Task CheckForNewFeatured()
 
             await this._webhookService.PostFeatured(newFeatured, this._client);
             await this._featuredService.SetFeatured(newFeatured);
-            await this._webhookService.SendFeaturedWebhooks(newFeatured);
 
             if (newFeatured.FeaturedMode == FeaturedMode.RecentPlays)
             {
                 await this._featuredService.ScrobbleTrack(this._client.CurrentUser.Id, newFeatured);
             }
+
+            _ = this._webhookService.SendFeaturedWebhooks(newFeatured);
         }
 
         Log.Information($"{nameof(CheckForNewFeatured)}: Setting new featured in bot");

diff --git a/src/FMBot.Bot/TextCommands/Guild/WebhookCommands.cs b/src/FMBot.Bot/TextCommands/Guild/WebhookCommands.cs
@@ -76,8 +76,6 @@ await ReplyAsync(
             return;
         }
 
-        var type = socketCommandContext.Channel.GetChannelType();
-
         var createdWebhook = await this._webhookService.CreateWebhook(this.Context, guild.GuildId);
 
         await this._webhookService.TestWebhook(createdWebhook, "If you see this message the webhook has been successfully added!\n\n" +