Improve Kick/Ban Commands permissions check

JonatanMGit · Feb 13, 2023 · 96af6d2 · 96af6d2
1 parent 13f09a3
commit 96af6d2
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 14 deletions.
diff --git a/bot/src/commands/ban.ts b/bot/src/commands/ban.ts
@@ -1,4 +1,5 @@
 import { SlashCommandBuilder } from '@discordjs/builders';
+import { GuildMember, User } from 'discord.js';
 
 module.exports = {
     data: new SlashCommandBuilder()
@@ -12,20 +13,26 @@ module.exports = {
                 .setDescription('The reason for the ban')
                 .setRequired(false))
         .setDescription('Bans a user'),
-        async execute(interaction) {
-            const user = interaction.options.getUser('user');
-            const reason = interaction.options.getString('reason');
-            if (user) {
-                // chck perms
-                if (interaction.member.permissions.has('BAN_MEMBERS')) {
-                    // ban user
-                    await interaction.guild.members.ban(user, { reason: reason });
-                    await interaction.reply(`Banned ${user}`);
-                } else {
-                    await interaction.reply({ content: 'You do not have permission to ban members', ephemeral: true });
+    async execute(interaction) {
+        const user = interaction.options.getUser('user') as GuildMember;
+        const reason = interaction.options.getString('reason');
+        if (user) {
+            // chck permissions and if user is bannable 
+            if (interaction.member.permissions.has('BAN_MEMBERS') && user.bannable) {
+                // send dm to user
+                let message = `You have been banned from ${interaction.guild.name}`;
+                if (reason) {
+                    message += ` for ${reason}`;
                 }
+                await user.send(message);
+                // ban user
+                await interaction.guild.members.ban(user, { reason: reason });
+                await interaction.reply(`Banned ${user}`);
             } else {
-                await interaction.reply({ content: 'You did not provide a user to ban', ephemeral: true });
+                await interaction.reply({ content: 'You do not have permission to ban members', ephemeral: true });
             }
+        } else {
+            await interaction.reply({ content: 'You did not provide a user to ban', ephemeral: true });
+        }
     },
 };
diff --git a/bot/src/commands/kick.ts b/bot/src/commands/kick.ts
@@ -1,5 +1,6 @@
+import { GuildMember } from "discord.js";
+
 const { SlashCommandBuilder } = require("@discordjs/builders");
-const { registerCommands, loadCommands } = require("../commandUtils");
 
 module.exports = {
     data: new SlashCommandBuilder()
@@ -19,9 +20,23 @@ module.exports = {
             return;
         }
         // get the user to kick
-        const user = interaction.options.getUser("user");
+        const user = interaction.options.getUser("user") as GuildMember;
+
+        // check if the user is kickable
+        if (!user.kickable) {
+            await interaction.reply({ content: "I can't kick this user", ephemeral: true });
+            return;
+        }
 
         const reason = interaction.options.getString("reason");
+
+        // send dm to user
+        let message = `You have been kicked from ${interaction.guild.name}`;
+        if (reason) {
+            message += ` for ${reason}`;
+        }
+        await user.send(message);
+
         // kick the user
         await interaction.guild.members.kick(user, { reason: reason });
         await interaction.reply(`Kicked ${user}`);