bugfixes

fmbot-discord · Nov 29, 2024 · eaee336 · eaee336
1 parent 9005e5b
commit eaee336
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/src/FMBot.Bot/Builders/CrownBuilders.cs b/src/FMBot.Bot/Builders/CrownBuilders.cs
@@ -18,6 +18,7 @@
 using FMBot.Bot.Resources;
 using Discord.Interactions;
 using FMBot.Bot.Factories;
+using FMBot.Domain;
 
 namespace FMBot.Bot.Builders;
 
@@ -210,7 +211,8 @@ public async Task<ResponseModel> CrownOverviewAsync(
             else
             {
                 response.Embed.WithDescription($"You or the user you're searching for don't have any crowns yet. \n\n" +
-                                               $"Use `{context.Prefix}whoknows` to start getting crowns!");
+                                               $"Use `{context.Prefix}whoknows` to start getting crowns!\n\n" +
+                                               $"Crowns are rewarded to the #1 listener for an artist with at least {guild.CrownsMinimumPlaycountThreshold ?? Constants.DefaultPlaysForCrown} plays.");
             }
 
             response.ResponseType = ResponseType.Embed;

diff --git a/src/FMBot.Bot/Builders/RecapBuilders.cs b/src/FMBot.Bot/Builders/RecapBuilders.cs
@@ -65,7 +65,8 @@ public async Task<ResponseModel> RecapAsync(ContextModel context,
     {
         var response = new ResponseModel
         {
-            ResponseType = ResponseType.Embed
+            ResponseType = ResponseType.Embed,
+            Stream = null
         };
 
         var footer = new StringBuilder();

diff --git a/src/FMBot.Bot/Extensions/InteractionContextExtensions.cs b/src/FMBot.Bot/Extensions/InteractionContextExtensions.cs
@@ -436,7 +436,7 @@ await message.ModifyAsync(m =>
         }
     }
 
-    private static Task ModifyPaginator(this IInteractionContext context, InteractiveService interactiveService,
+    private static async Task ModifyPaginator(this IInteractionContext context, InteractiveService interactiveService,
         IUserMessage message, ResponseModel response)
     {
         if (context.Interaction.IntegrationOwners.ContainsKey(ApplicationIntegrationType.UserInstall) &&
@@ -450,12 +450,20 @@ private static Task ModifyPaginator(this IInteractionContext context, Interactiv
         }
         else
         {
+            if (message.Attachments != null && message.Attachments.Any())
+            {
+                await message.ModifyAsync(m =>
+                {
+                    m.Attachments = null;
+                });
+            }
+
             _ = interactiveService.SendPaginatorAsync(
                 response.StaticPaginator.Build(),
                 message,
                 TimeSpan.FromMinutes(DiscordConstants.PaginationTimeoutInSeconds));
         }
 
-        return Task.CompletedTask;
+        return;
     }
 }
diff --git a/src/FMBot.Bot/Resources/InteractionConstants.cs b/src/FMBot.Bot/Resources/InteractionConstants.cs
@@ -45,6 +45,7 @@ public static class Discogs
 
     public const string ImportManage = "user-import-manage";
     public const string ImportSetting = "user-import-setting";
+    public const string ImportModify = "user-import-modify";
     public const string ImportClearSpotify = "user-import-clear-spotify";
     public const string ImportClearAppleMusic = "user-import-clear-applemusic";
 

diff --git a/src/FMBot.Bot/Services/SupporterService.cs b/src/FMBot.Bot/Services/SupporterService.cs
@@ -935,7 +935,7 @@ public async Task UpdateDiscordSupporters(List<DiscordEntitlement> discordSuppor
     public async Task CheckExpiredDiscordSupporters()
     {
         var expiredDate = DateTime.UtcNow.AddDays(-3);
-        var modifiedDate = DateTime.UtcNow.AddDays(-35);
+        var modifiedDate = DateTime.UtcNow.AddDays(-20);
 
         await using var db = await this._contextFactory.CreateDbContextAsync();
         var possiblyExpiredSupporters = await db.Supporters

diff --git a/src/FMBot.Bot/TextCommands/LastFM/PlayCommands.cs b/src/FMBot.Bot/TextCommands/LastFM/PlayCommands.cs
@@ -240,7 +240,7 @@ public async Task OverviewAsync([Remainder] string extraOptions = null)
 
     [Command("year", RunMode = RunMode.Async)]
     [Summary("Shows an overview of your year")]
-    [Alias("yr", "lastyear", "yearoverview", "yearov", "yov", "last.year", "wrapped")]
+    [Alias("yr", "lastyear", "yearoverview", "yearov", "yov", "last.year")]
     [UsernameSetRequired]
     [CommandCategories(CommandCategory.Tracks, CommandCategory.Albums, CommandCategory.Artists)]
     public async Task YearAsync([Remainder] string extraOptions = null)
@@ -272,6 +272,7 @@ public async Task YearAsync([Remainder] string extraOptions = null)
     [UsernameSetRequired]
     [CommandCategories(CommandCategory.Tracks, CommandCategory.Albums, CommandCategory.Artists)]
     [ExcludeFromHelp]
+    [Alias("rcp", "wrapped")]
     public async Task RecapAsync([Remainder] string extraOptions = null)
     {
         _ = this.Context.Channel.TriggerTypingAsync();