Use SlashCommandContext for user context commands as workaround for p…

…otential DSharpPlus bug
Erisa · Nov 24, 2024 · 4ee23a2 · 4ee23a2
1 parent 8d0a063
commit 4ee23a2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 31 deletions.
diff --git a/Commands/FunCmds.cs b/Commands/FunCmds.cs
@@ -7,7 +7,7 @@ public class FunCmds
         [Command("Hug")]
         [SlashCommandTypes(DiscordApplicationCommandType.UserContextMenu)]
         [AllowedProcessors(typeof(UserCommandProcessor))]
-        public async Task Hug(UserCommandContext ctx, DiscordUser targetUser)
+        public async Task Hug(SlashCommandContext ctx, DiscordUser targetUser)
         {
             var user = targetUser;
 

diff --git a/Commands/UserNoteCmds.cs b/Commands/UserNoteCmds.cs
@@ -8,7 +8,7 @@ internal class UserNoteCmds
         [SlashCommandTypes(DiscordApplicationCommandType.UserContextMenu)]
         [AllowedProcessors(typeof(UserCommandProcessor))]
         [RequireHomeserverPerm(ServerPermLevel.TrialModerator), RequirePermissions(DiscordPermission.ModerateMembers)]
-        public async Task ShowNotes(UserCommandContext ctx, DiscordUser targetUser)
+        public async Task ShowNotes(SlashCommandContext ctx, DiscordUser targetUser)
         {
             await ctx.RespondAsync(embed: await UserNoteHelpers.GenerateUserNotesEmbedAsync(targetUser), ephemeral: true);
         }

diff --git a/Commands/UtilityCmds.cs b/Commands/UtilityCmds.cs
@@ -5,7 +5,7 @@ public class UtilityCmds
         [Command("Show Avatar")]
         [SlashCommandTypes(DiscordApplicationCommandType.UserContextMenu)]
         [AllowedProcessors(typeof(UserCommandProcessor))]
-        public async Task ContextAvatar(UserCommandContext ctx, DiscordUser targetUser)
+        public async Task ContextAvatar(SlashCommandContext ctx, DiscordUser targetUser)
         {
             string avatarUrl = await LykosAvatarMethods.UserOrMemberAvatarURL(targetUser, ctx.Guild);
 
@@ -24,7 +24,7 @@ public async Task ContextAvatar(UserCommandContext ctx, DiscordUser targetUser)
         [Command("User Information")]
         [SlashCommandTypes(DiscordApplicationCommandType.UserContextMenu)]
         [AllowedProcessors(typeof(UserCommandProcessor))]
-        public async Task ContextUserInformation(UserCommandContext ctx, DiscordUser targetUser)
+        public async Task ContextUserInformation(SlashCommandContext ctx, DiscordUser targetUser)
         {
             await ctx.RespondAsync(embed: await DiscordHelpers.GenerateUserEmbed(targetUser, ctx.Guild), ephemeral: true);
         }

diff --git a/Commands/WarningCmds.cs b/Commands/WarningCmds.cs
@@ -7,7 +7,7 @@ internal class WarningCmds
         [Command("Show Warnings")]
         [SlashCommandTypes(DiscordApplicationCommandType.UserContextMenu)]
         [AllowedProcessors(typeof(UserCommandProcessor))]
-        public async Task ContextWarnings(UserCommandContext ctx, DiscordUser targetUser)
+        public async Task ContextWarnings(SlashCommandContext ctx, DiscordUser targetUser)
         {
             await ctx.RespondAsync(embed: await WarningHelpers.GenerateWarningsEmbedAsync(targetUser), ephemeral: true);
         }

diff --git a/Events/ErrorEvents.cs b/Events/ErrorEvents.cs
@@ -21,8 +21,7 @@ public static async Task CommandErrored(CommandsExtension _, CommandErroredEvent
             else if (e.Context is SlashCommandContext)
             {
                 // Interaction command error (slash, user ctx, message ctx)
-                if (e.Context is UserCommandContext) await InteractionEvents.ContextCommandErrored(e); // this works because UserCommandContext inherits from SlashCommandContext
-                else await InteractionEvents.SlashCommandErrored(e);
+                await InteractionEvents.SlashCommandErrored(e);
             }
         }
 

diff --git a/Events/InteractionEvents.cs b/Events/InteractionEvents.cs
@@ -230,29 +230,5 @@ await e.Context.RespondAsync(new DiscordInteractionResponseBuilder().WithContent
             e.Context.Client.Logger.LogError(CliptokEventID, e.Exception, "Error during invocation of interaction command {command} by {user}", e.Context.Command.Name, $"{DiscordHelpers.UniqueUsername(e.Context.User)}");
         }
 
-        public static async Task ContextCommandErrored(CommandErroredEventArgs e)
-        {
-            if (e.Exception is ChecksFailedException slex)
-            {
-                foreach (var check in slex.Errors)
-                    if (check.ContextCheckAttribute is RequireHomeserverPermAttribute att && e.Context.Command.Name != "edit")
-                    {
-                        var level = (await GetPermLevelAsync(e.Context.Member));
-                        var levelText = level.ToString();
-                        if (level == ServerPermLevel.Nothing && rand.Next(1, 100) == 69)
-                            levelText = $"naught but a thing, my dear human. Congratulations, you win {rand.Next(1, 10)} bonus points.";
-
-                        await e.Context.RespondAsync(
-                            new DiscordInteractionResponseBuilder().WithContent(
-                                $"{cfgjson.Emoji.NoPermissions} Invalid permission level to use command **{e.Context.Command.Name}**!\n" +
-                                $"Required: `{att.TargetLvl}`\n" +
-                                $"You have: `{levelText}`")
-                                .AsEphemeral(true)
-                            );
-                    }
-            }
-            e.Context.Client.Logger.LogError(CliptokEventID, e.Exception, "Error during invocation of context command {command} by {user}", e.Context.Command.Name, $"{DiscordHelpers.UniqueUsername(e.Context.User)}");
-        }
-
     }
 }