fix: Fixed .h not working on some commands

add: Added select menu for the .mdls command
dev: Reworked the way interactions are created and sent. It is much better but far from perfect

src/NadekoBot/Modules/Administration/DangerousCommands/CleanupService.cs

@@ -12,7 +12,7 @@ public sealed class CleanupService : ICleanupService, IReadyExecutor, INService
     private TypedKey<KeepReport> _keepReportKey = new("cleanup:report");
     private TypedKey<bool> _keepTriggerKey = new("cleanup:trigger");
     private readonly DiscordSocketClient _client;
-    private ConcurrentDictionary<int, ulong[]> guildIds;
+    private ConcurrentDictionary<int, ulong[]> guildIds = new();
     private readonly IBotCredsProvider _creds;
     private readonly DbService _db;
 

src/NadekoBot/Modules/Expressions/NadekoExpressions.cs

@@ -68,9 +68,9 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
 
 
     [Cmd]
-    public async Task ExprAdd(string key, [Leftover] string message)
+    public async Task ExprAdd(string trigger, [Leftover] string response)
     {
-        if (string.IsNullOrWhiteSpace(message) || string.IsNullOrWhiteSpace(key))
+        if (string.IsNullOrWhiteSpace(response) || string.IsNullOrWhiteSpace(trigger))
         {
             return;
         }
@@ -81,7 +81,7 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
             return;
         }
 
-        await ExprAddInternalAsync(key, message);
+        await ExprAddInternalAsync(trigger, response);
     }
 
     [Cmd]

src/NadekoBot/Modules/Gambling/Gambling.cs

@@ -74,7 +74,7 @@ public partial class Gambling : GamblingModule<GamblingService>
         var stats = await _gamblingTxTracker.GetAllAsync();
 
         var eb = _sender.CreateEmbed()
-            .WithOkColor();
+                        .WithOkColor();
 
         var str = "` Feature `｜`   Bet  `｜`Paid Out`｜`  RoI  `\n";
         str += "――――――――――――――――――――\n";
@@ -119,15 +119,15 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         // [21:03] Bob Page: Kinda remids me of US economy
         var embed = _sender.CreateEmbed()
-                    .WithTitle(GetText(strs.economy_state))
-                    .AddField(GetText(strs.currency_owned), N(ec.Cash - ec.Bot))
-                    .AddField(GetText(strs.currency_one_percent), (onePercent * 100).ToString("F2") + "%")
-                    .AddField(GetText(strs.currency_planted), N(ec.Planted))
-                    .AddField(GetText(strs.owned_waifus_total), N(ec.Waifus))
-                    .AddField(GetText(strs.bot_currency), N(ec.Bot))
-                    .AddField(GetText(strs.bank_accounts), N(ec.Bank))
-                    .AddField(GetText(strs.total), N(ec.Cash + ec.Planted + ec.Waifus + ec.Bank))
-                    .WithOkColor();
+                           .WithTitle(GetText(strs.economy_state))
+                           .AddField(GetText(strs.currency_owned), N(ec.Cash - ec.Bot))
+                           .AddField(GetText(strs.currency_one_percent), (onePercent * 100).ToString("F2") + "%")
+                           .AddField(GetText(strs.currency_planted), N(ec.Planted))
+                           .AddField(GetText(strs.owned_waifus_total), N(ec.Waifus))
+                           .AddField(GetText(strs.bot_currency), N(ec.Bot))
+                           .AddField(GetText(strs.bank_accounts), N(ec.Bank))
+                           .AddField(GetText(strs.total), N(ec.Cash + ec.Planted + ec.Waifus + ec.Bank))
+                           .WithOkColor();
 
         // ec.Cash already contains ec.Bot as it's the total of all values in the CurrencyAmount column of the DiscordUser table
         await Response().Embed(embed).SendAsync();
@@ -155,17 +155,14 @@ public partial class Gambling : GamblingModule<GamblingService>
     }
 
     private NadekoInteraction CreateRemindMeInteraction(int period)
-    {
-        return _inter
+        => _inter
             .Create(ctx.User.Id,
-                new SimpleInteraction<DateTime>(
-                    new ButtonBuilder(
-                        label: "Remind me",
-                        emote: Emoji.Parse("⏰"),
-                        customId: "timely:remind_me"),
-                    RemindTimelyAction,
-                    DateTime.UtcNow.Add(TimeSpan.FromHours(period))));
-    }
+                new ButtonBuilder(
+                    label: "Remind me",
+                    emote: Emoji.Parse("⏰"),
+                    customId: "timely:remind_me"),
+                (smc) => RemindTimelyAction(smc, DateTime.UtcNow.Add(TimeSpan.FromHours(period)))
+            );
 
     [Cmd]
     public async Task Timely()
@@ -311,9 +308,9 @@ public partial class Gambling : GamblingModule<GamblingService>
         }
 
         var embed = _sender.CreateEmbed()
-                    .WithTitle(GetText(strs.transactions(((SocketGuild)ctx.Guild)?.GetUser(userId)?.ToString()
-                                                         ?? $"{userId}")))
-                    .WithOkColor();
+                           .WithTitle(GetText(strs.transactions(((SocketGuild)ctx.Guild)?.GetUser(userId)?.ToString()
+                                                                ?? $"{userId}")))
+                           .WithOkColor();
 
         var sb = new StringBuilder();
         foreach (var tr in trs)
@@ -408,7 +405,7 @@ public partial class Gambling : GamblingModule<GamblingService>
         await Response().Confirm(strs.has(Format.Code(userId.ToString()), cur)).SendAsync();
     }
 
-    private async Task BankAction(SocketMessageComponent smc, object _)
+    private async Task BankAction(SocketMessageComponent smc)
     {
         var balance = await _bank.GetBalanceAsync(ctx.User.Id);
 
@@ -419,11 +416,11 @@ public partial class Gambling : GamblingModule<GamblingService>
     }
 
     private NadekoInteraction CreateCashInteraction()
-        => _inter.Create<object>(ctx.User.Id,
-            new(new(
-                    customId: "cash:bank_show_balance",
-                    emote: new Emoji("🏦")),
-                BankAction));
+        => _inter.Create(ctx.User.Id,
+            new ButtonBuilder(
+                customId: "cash:bank_show_balance",
+                emote: new Emoji("🏦")),
+            BankAction);
 
     [Cmd]
     [Priority(1)]
@@ -732,10 +729,10 @@ public partial class Gambling : GamblingModule<GamblingService>
         }
 
         var eb = _sender.CreateEmbed()
-                 .WithAuthor(ctx.User)
-                 .WithDescription(Format.Bold(str))
-                 .AddField(GetText(strs.roll2), result.Roll.ToString(CultureInfo.InvariantCulture))
-                 .WithOkColor();
+                        .WithAuthor(ctx.User)
+                        .WithDescription(Format.Bold(str))
+                        .AddField(GetText(strs.roll2), result.Roll.ToString(CultureInfo.InvariantCulture))
+                        .WithOkColor();
 
         await Response().Embed(eb).SendAsync();
     }
@@ -787,7 +784,7 @@ public partial class Gambling : GamblingModule<GamblingService>
                 return await uow.Set<DiscordUser>().GetTopRichest(_client.CurrentUser.Id, curPage);
             }
         }
-        
+
         var res = Response()
             .Paginated();
 
@@ -799,8 +796,9 @@ public partial class Gambling : GamblingModule<GamblingService>
               .CurrentPage(page)
               .Page((toSend, curPage) =>
               {
-                  var embed = _sender.CreateEmbed().WithOkColor()
-                                                .WithTitle(CurrencySign + " " + GetText(strs.leaderboard));
+                  var embed = _sender.CreateEmbed()
+                                     .WithOkColor()
+                                     .WithTitle(CurrencySign + " " + GetText(strs.leaderboard));
 
                   if (!toSend.Any())
                   {
@@ -923,11 +921,11 @@ public partial class Gambling : GamblingModule<GamblingService>
         }
 
         var eb = _sender.CreateEmbed()
-                 .WithOkColor()
-                 .WithDescription(sb.ToString())
-                 .AddField(GetText(strs.multiplier), $"{result.Multiplier:0.##}x", true)
-                 .AddField(GetText(strs.won), $"{(long)result.Won}", true)
-                 .WithAuthor(ctx.User);
+                        .WithOkColor()
+                        .WithDescription(sb.ToString())
+                        .AddField(GetText(strs.multiplier), $"{result.Multiplier:0.##}x", true)
+                        .AddField(GetText(strs.won), $"{(long)result.Won}", true)
+                        .WithAuthor(ctx.User);
 
 
         await Response().Embed(eb).SendAsync();

src/NadekoBot/Modules/Gambling/Slot/SlotCommands.cs

@@ -76,9 +76,12 @@ public partial class Gambling
                 .WithOkColor();
 
             var bb = new ButtonBuilder(emote: Emoji.Parse("🔁"), customId: "slot:again", label: "Pull Again");
-            var si = new SimpleInteraction<long>(bb, (_, amount) => Slot(amount), amount);
+            var inter = _inter.Create(ctx.User.Id, bb, smc =>
+            {
+                smc.DeferAsync();
+                return Slot(amount);
+            });
 
-            var inter = _inter.Create(ctx.User.Id, si);
             var msg = await ctx.Channel.SendFileAsync(imgStream,
                 "result.png",
                 embed: eb.Build(),

src/NadekoBot/Modules/Help/Help.cs

@@ -4,6 +4,7 @@ using NadekoBot.Modules.Help.Services;
 using Newtonsoft.Json;
 using System.Text;
 using Nadeko.Common.Medusa;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal.Mapping;
 
 namespace NadekoBot.Modules.Help;
 
@@ -86,11 +87,31 @@ public sealed partial class Help : NadekoModule<HelpService>
                 topLevelModules.Add(m);
         }
 
+        var menu = new SelectMenuBuilder()
+                   .WithPlaceholder("Select a module to see its commands")
+                   .WithCustomId("modules");
+
+        foreach (var m in topLevelModules)
+            menu.AddOption(m.Name, m.Name, GetModuleEmoji(m.Name));
+
+        var inter = _inter.Create(ctx.User.Id,
+            menu,
+            async (smc) =>
+            {
+                await smc.DeferAsync();
+                var val = smc.Data.Values.FirstOrDefault();
+                if (val is null)
+                    return;
+                
+                await Commands(val);
+            });
+
         await Response()
               .Paginated()
               .Items(topLevelModules)
               .PageSize(12)
               .CurrentPage(page)
+              .Interaction(inter)
               .AddFooter(false)
               .Page((items, _) =>
               {
@@ -442,7 +463,7 @@ public sealed partial class Help : NadekoModule<HelpService>
                  .SendAsync();
 
 
-    private Task SelfhostAction(SocketMessageComponent smc, object _)
+    private Task SelfhostAction(SocketMessageComponent smc)
         => smc.RespondConfirmAsync(_sender,
             """
             - In case you don't want or cannot Donate to NadekoBot project, but you
@@ -460,11 +481,11 @@ public sealed partial class Help : NadekoModule<HelpService>
     public async Task Donate()
     {
         var selfhostInter = _inter.Create(ctx.User.Id,
-            new SimpleInteraction<object>(new ButtonBuilder(
-                    emote: new Emoji("🖥️"),
-                    customId: "donate:selfhosting",
-                    label: "Selfhosting"),
-                SelfhostAction));
+            new ButtonBuilder(
+                emote: new Emoji("🖥️"),
+                customId: "donate:selfhosting",
+                label: "Selfhosting"),
+            SelfhostAction);
 
         var eb = _sender.CreateEmbed()
                         .WithOkColor()

src/NadekoBot/Modules/Utility/Repeater/RepeatCommands.cs

@@ -117,35 +117,35 @@ public partial class Utility
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.ManageMessages)]
         [Priority(0)]
-        public Task Repeat(ITextChannel ch, StoopidTime interval, [Leftover] string message)
-            => Repeat(ch, null, interval, message);
+        public Task Repeat(ITextChannel channel, StoopidTime interval, [Leftover] string message)
+            => Repeat(channel, null, interval, message);
 
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.ManageMessages)]
         [Priority(1)]
-        public Task Repeat(GuildDateTime dt, [Leftover] string message)
-            => Repeat(dt, null, message);
+        public Task Repeat(GuildDateTime timeOfDay, [Leftover] string message)
+            => Repeat(timeOfDay, null, message);
 
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.ManageMessages)]
         [Priority(1)]
-        public Task Repeat(ITextChannel channel, GuildDateTime dt, [Leftover] string message)
-            => Repeat(channel, dt, null, message);
+        public Task Repeat(ITextChannel channel, GuildDateTime timeOfDay, [Leftover] string message)
+            => Repeat(channel, timeOfDay, null, message);
 
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.ManageMessages)]
         [Priority(2)]
-        public Task Repeat(GuildDateTime? dt, StoopidTime? interval, [Leftover] string message)
-            => Repeat(ctx.Channel, dt, interval, message);
+        public Task Repeat(GuildDateTime? timeOfDay, StoopidTime? interval, [Leftover] string message)
+            => Repeat(ctx.Channel, timeOfDay, interval, message);
 
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.ManageMessages)]
         [Priority(3)]
-        public async Task Repeat(IMessageChannel channel, GuildDateTime? dt, StoopidTime? interval,
+        public async Task Repeat(IMessageChannel channel, GuildDateTime? timeOfDay, StoopidTime? interval,
             [Leftover] string message)
         {
             if (channel is not ITextChannel txtCh || txtCh.GuildId != ctx.Guild.Id)
@@ -155,7 +155,7 @@ public partial class Utility
             if (!perms.SendMessages)
                 return;
 
-            var startTimeOfDay = dt?.InputTimeUtc.TimeOfDay;
+            var startTimeOfDay = timeOfDay?.InputTimeUtc.TimeOfDay;
             // if interval not null, that means user specified it (don't change it)
 
             // if interval is null set the default to:

src/NadekoBot/Modules/Xp/Xp.cs

@@ -475,7 +475,8 @@ public partial class Xp : NadekoModule<XpService>
                           emote: Emoji.Parse("👐"),
                           isDisabled: ownedItem.IsUsing);
 
-                      var inter = new SimpleInteraction<(string key, XpShopItemType type)?>(
+                      var inter = _inter.Create(
+                          ctx.User.Id,
                           button,
                           OnShopUse,
                           (key, itemType));
@@ -488,7 +489,8 @@ public partial class Xp : NadekoModule<XpService>
                           "xpshop:buy",
                           emote: Emoji.Parse("💰"));
 
-                      var inter = new SimpleInteraction<(string key, XpShopItemType type)?>(
+                      var inter = _inter.Create(
+                          ctx.User.Id,
                           button,
                           OnShopBuy,
                           (key, itemType));
@@ -507,10 +509,10 @@ public partial class Xp : NadekoModule<XpService>
         NadekoInteraction GetUseInteraction()
         {
             return _inter.Create(ctx.User.Id,
-                new SimpleInteraction<object>(
-                    new ButtonBuilder(label: "Use", customId: "xpshop:use_item", emote: Emoji.Parse("👐")),
-                    async (smc, _) => await XpShopUse(type, key)
-                ));
+                new(label: "Use", customId: "xpshop:use_item", emote: Emoji.Parse("👐")),
+                async (_, state) => await XpShopUse(state.type, state.key),
+                (type, key)
+            );
         }
 
         if (result != BuyResult.Success)
@@ -551,11 +553,8 @@ public partial class Xp : NadekoModule<XpService>
         await ctx.OkAsync();
     }
 
-    private async Task OnShopUse(SocketMessageComponent smc, (string? key, XpShopItemType type)? maybeState)
+    private async Task OnShopUse(SocketMessageComponent smc, (string key, XpShopItemType type) state)
     {
-        if (maybeState is not { } state)
-            return;
-
         var (key, type) = state;
 
         var result = await _service.UseShopItemAsync(ctx.User.Id, type, key);
@@ -567,11 +566,8 @@ public partial class Xp : NadekoModule<XpService>
         }
     }
 
-    private async Task OnShopBuy(SocketMessageComponent smc, (string? key, XpShopItemType type)? maybeState)
+    private async Task OnShopBuy(SocketMessageComponent smc, (string key, XpShopItemType type) state)
     {
-        if (maybeState is not { } state)
-            return;
-
         var (key, type) = state;
 
         var result = await _service.BuyShopItemAsync(ctx.User.Id, type, key);