Enforce prefix permissions and wire config wizard modRole for moderation commands

codebymitch · codebymitch · commit 1072abfbd7ab · 2026-06-20T23:20:56.000+10:00
diff --git a/src/commands/Moderation/cases.js b/src/commands/Moderation/cases.js
@@ -31,6 +31,8 @@ export default {
                 .setMaxValue(50)
         ),
 
+    category: 'moderation',
+
     async execute(interaction, config, client) {
         const deferSuccess = await InteractionHelper.safeDefer(interaction);
         if (!deferSuccess) {
diff --git a/src/commands/Moderation/dm.js b/src/commands/Moderation/dm.js
@@ -29,7 +29,7 @@ export default {
         )
         .setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers)
         .setDMPermission(false),
-    category: "Moderation",
+    category: "moderation",
 
     async execute(interaction, config, client) {
         const deferSuccess = await InteractionHelper.safeDefer(interaction);
diff --git a/src/commands/Moderation/kick.js b/src/commands/Moderation/kick.js
@@ -23,14 +23,6 @@ export default {
 
   async execute(interaction, config, client) {
     try {
-      if (!interaction.member.permissions.has(PermissionFlagsBits.KickMembers)) {
-        throw new TitanBotError(
-          "User lacks permission",
-          ErrorTypes.PERMISSION,
-          "You do not have permission to kick members."
-        );
-      }
-
       const targetUser = interaction.options.getUser("target");
       const member = interaction.options.getMember("target");
       const reason = interaction.options.getString("reason") || "No reason provided";
diff --git a/src/commands/Moderation/lock.js b/src/commands/Moderation/lock.js
@@ -25,9 +25,6 @@ export default {
       return;
     }
 
-    if (!interaction.member.permissions.has(PermissionFlagsBits.ManageChannels))
-      return await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: 'You need the `Manage Channels` permission to lock channels.' });
-
     const channel = interaction.channel;
     const everyoneRole = interaction.guild.roles.everyone;
 
diff --git a/src/commands/Moderation/massban.js b/src/commands/Moderation/massban.js
@@ -44,10 +44,6 @@ export default {
             return;
         }
 
-        if (!interaction.member.permissions.has(PermissionFlagsBits.BanMembers)) {
-            return await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: 'You do not have permission to ban members.' });
-        }
-
         const usersInput = interaction.options.getString("users");
         const reason = interaction.options.getString("reason") || "Mass ban - No reason provided";
         const deleteDays = interaction.options.getInteger("delete_days") || 0;
diff --git a/src/commands/Moderation/masskick.js b/src/commands/Moderation/masskick.js
@@ -36,10 +36,6 @@ export default {
             return;
         }
 
-        if (!interaction.member.permissions.has(PermissionFlagsBits.KickMembers)) {
-            return await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: 'You do not have permission to kick members.' });
-        }
-
         const usersInput = interaction.options.getString("users");
         const reason = interaction.options.getString("reason") || "Mass kick - No reason provided";
 
diff --git a/src/commands/Moderation/purge.js b/src/commands/Moderation/purge.js
@@ -32,9 +32,6 @@ export default {
       return;
     }
 
-    if (!interaction.member.permissions.has(PermissionFlagsBits.ManageMessages))
-      return await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: 'You need the `Manage Messages` permission to purge messages.' });
-
     const amount = interaction.options.getInteger("amount");
     const channel = interaction.channel;
 
diff --git a/src/commands/Moderation/timeout.js b/src/commands/Moderation/timeout.js
@@ -51,14 +51,6 @@ export default {
         }
 
         try {
-            if (!interaction.member.permissions.has(PermissionFlagsBits.ModerateMembers)) {
-                throw new TitanBotError(
-                    "User lacks permission",
-                    ErrorTypes.PERMISSION,
-                    "You need the `Moderate Members` permission to set a timeout."
-                );
-            }
-
             const targetUser = interaction.options.getUser("target");
             const member = interaction.options.getMember("target");
             const durationMinutes = interaction.options.getInteger("duration");
diff --git a/src/commands/Moderation/unlock.js b/src/commands/Moderation/unlock.js
@@ -25,13 +25,6 @@ export default {
             return;
         }
 
-        if (
-            !interaction.member.permissions.has(
-                PermissionFlagsBits.ManageChannels,
-            )
-        )
-            return await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: 'You need the `Manage Channels` permission to unlock channels.' });
-
         const channel = interaction.channel;
         const everyoneRole = interaction.guild.roles.everyone;
 
diff --git a/src/commands/Moderation/usernotes.js b/src/commands/Moderation/usernotes.js
@@ -90,10 +90,6 @@ export default {
     category: "moderation",
 
     async execute(interaction, config, client) {
-        if (!interaction.member.permissions.has(PermissionFlagsBits.ManageMessages)) {
-            return await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: 'You do not have permission to manage user notes.' });
-        }
-
         const subcommand = interaction.options.getSubcommand();
         const targetUser = interaction.options.getUser("target");
         const guildId = interaction.guild.id;
diff --git a/src/commands/Moderation/warn.js b/src/commands/Moderation/warn.js
@@ -37,10 +37,6 @@ export default {
         }
 
         try {
-                if (!interaction.member.permissions.has(PermissionFlagsBits.ModerateMembers)) {
-                    throw new Error("You need the `Moderate Members` permission to issue warnings.");
-                }
-
                 const target = interaction.options.getUser("target");
                 const member = interaction.options.getMember("target");
                 const reason = interaction.options.getString("reason");
diff --git a/src/events/interactionCreate.js b/src/events/interactionCreate.js
@@ -12,6 +12,7 @@ import { isCommandEnabled } from '../services/commandAccessService.js';
 import { resolveSlashAccessKey } from '../utils/messageAdapter.js';
 import { isCollectorManagedComponent } from '../utils/collectorComponents.js';
 import { ResponseCoordinator } from '../utils/responseCoordinator.js';
+import { enforceDefaultCommandPermissions } from '../utils/permissionGuard.js';
 
 function withTraceContext(context = {}, traceContext = {}) {
   return {
@@ -93,6 +94,14 @@ export default {
               }
             }
 
+            const permissionAllowed = await enforceDefaultCommandPermissions(interaction, command, {
+              source: 'interactionCreate',
+              guildConfig,
+            });
+            if (!permissionAllowed) {
+              return;
+            }
+
             await command.execute(interaction, guildConfig, client);
           } catch (error) {
             await handleInteractionError(interaction, error, withTraceContext({
diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
@@ -110,7 +110,7 @@ async function handlePrefixCommand(message, client) {
 
     logger.info(`Executing prefix command: ${prefix}${commandName} (resolved to ${resolvedCommandName}) by ${message.author.tag}`);
     
-    await executePrefixCommand(command, message, args, client, prefix);
+    await executePrefixCommand(command, message, args, client, prefix, guildConfig);
   } catch (error) {
     logger.error('Error handling prefix command:', error);
   }
diff --git a/src/utils/messageAdapter.js b/src/utils/messageAdapter.js
@@ -6,6 +6,7 @@ import { logger } from './logger.js';
 import { InteractionHelper } from './interactionHelper.js';
 import { SLASH_ONLY_COMMANDS } from '../config/prefixRestrictions.js';
 import { ResponseCoordinator, buildPrefixUsage } from './responseCoordinator.js';
+import { enforceDefaultCommandPermissions } from './permissionGuard.js';
 
 export { buildPrefixUsage };
 
@@ -185,22 +186,30 @@ export function supportsPrefixExecution(command) {
   return !!command.execute;
 }
 
-export async function executePrefixCommand(command, message, args, client, prefixOverride = null) {
+export async function executePrefixCommand(command, message, args, client, prefixOverride = null, guildConfig = null) {
   const mockInteraction = createMockInteraction(message, command.data, args);
   const coordinator = mockInteraction._responseCoordinator;
   const prefix = prefixOverride || message.client?.config?.bot?.prefix || '!';
 
   try {
+    const permissionAllowed = await enforceDefaultCommandPermissions(mockInteraction, command, {
+      source: 'messageAdapter.executePrefixCommand',
+      guildConfig,
+    });
+    if (!permissionAllowed) {
+      return;
+    }
+
     const validation = mockInteraction.options.validateRequired();
     if (!validation.valid) {
       await coordinator.respondUsageFromCommand(prefix, command.data, validation);
       return;
     }
 
     if (command.prefixExecute) {
-      await command.prefixExecute(mockInteraction, client.config, client);
+      await command.prefixExecute(mockInteraction, guildConfig, client);
     } else {
-      await command.execute(mockInteraction, client.config, client);
+      await command.execute(mockInteraction, guildConfig, client);
     }
   } catch (error) {
     logger.error('Prefix command execution error:', {
diff --git a/src/utils/permissionGuard.js b/src/utils/permissionGuard.js
diff --git a/tests/prefixPermissions.test.js b/tests/prefixPermissions.test.js

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export default {`
`29`	`29`	`)`
`30`	`30`	`.setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers)`
`31`	`31`	`.setDMPermission(false),`
`32`		`- category: "Moderation",`
	`32`	`+ category: "moderation",`
`33`	`33`
`34`	`34`	`async execute(interaction, config, client) {`
`35`	`35`	`const deferSuccess = await InteractionHelper.safeDefer(interaction);`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,6 @@ export default {`
`25`	`25`	`return;`
`26`	`26`	`}`
`27`	`27`
`28`		`- if (!interaction.member.permissions.has(PermissionFlagsBits.ManageChannels))`
`29`		- return await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: 'You need the `Manage Channels` permission to lock channels.' });
`30`		`-`
`31`	`28`	`const channel = interaction.channel;`
`32`	`29`	`const everyoneRole = interaction.guild.roles.everyone;`
`33`	`30`
Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,6 @@ export default {`
`36`	`36`	`return;`
`37`	`37`	`}`
`38`	`38`
`39`		`- if (!interaction.member.permissions.has(PermissionFlagsBits.KickMembers)) {`
`40`		`- return await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: 'You do not have permission to kick members.' });`
`41`		`- }`
`42`		`-`
`43`	`39`	`const usersInput = interaction.options.getString("users");`
`44`	`40`	`const reason = interaction.options.getString("reason") \|\| "Mass kick - No reason provided";`
`45`	`41`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,6 @@ export default {`
`32`	`32`	`return;`
`33`	`33`	`}`
`34`	`34`
`35`		`- if (!interaction.member.permissions.has(PermissionFlagsBits.ManageMessages))`
`36`		- return await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: 'You need the `Manage Messages` permission to purge messages.' });
`37`		`-`
`38`	`35`	`const amount = interaction.options.getInteger("amount");`
`39`	`36`	`const channel = interaction.channel;`
`40`	`37`