Make staff command permissions a little stricter

Author: TechnoVisionDev

src/main/java/technobot/commands/staff/ClearCommand.java

@@ -31,7 +31,7 @@ public ClearCommand(TechnoBot bot) {
         this.args.add(new OptionData(OptionType.INTEGER, "amount", "Number of messages to clear", true)
                 .setMinValue(1)
                 .setMaxValue(100));
-        this.permission = Permission.MESSAGE_MANAGE;
+        this.permission = Permission.MANAGE_SERVER;
     }
 
     @Override

src/main/java/technobot/commands/staff/MuteCommand.java

@@ -0,0 +1,93 @@
+package technobot.commands.staff;
+
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import net.dv8tion.jda.api.interactions.commands.OptionMapping;
+import net.dv8tion.jda.api.interactions.commands.OptionType;
+import net.dv8tion.jda.api.interactions.commands.build.OptionData;
+import technobot.TechnoBot;
+import technobot.commands.Category;
+import technobot.commands.Command;
+import technobot.util.CommandUtils;
+import technobot.util.embeds.EmbedColor;
+import technobot.util.embeds.EmbedUtils;
+
+import java.util.Date;
+
+/**
+ * Command that adds a muted role to a user in the guild.
+ *
+ * @author TechnoVision
+ */
+public class MuteCommand extends Command {
+
+    public MuteCommand(TechnoBot bot) {
+        super(bot);
+        this.name = "mute";
+        this.description = "Kicks a user from your server.";
+        this.category = Category.STAFF;
+        this.args.add(new OptionData(OptionType.USER, "user", "The user to kick", true));
+        this.args.add(new OptionData(OptionType.STRING, "reason", "Reason for the kick"));
+        this.permission = Permission.MANAGE_ROLES;
+    }
+
+    @Override
+    public void execute(SlashCommandInteractionEvent event) {
+        event.deferReply().queue();
+        // Get command and member data
+        User user = event.getOption("user").getAsUser();
+        Member target = event.getOption("user").getAsMember();
+        if (target == null) {
+            event.getHook().sendMessageEmbeds(EmbedUtils.createError("That user is not in this server!")).queue();
+            return;
+        } else if (target.getIdLong() == event.getJDA().getSelfUser().getIdLong()) {
+            event.getHook().sendMessageEmbeds(EmbedUtils.createError("Do you seriously expect me to kick myself?")).queue();
+            return;
+        }
+        OptionMapping reasonOption = event.getOption("reason");
+        String reason = reasonOption != null ? reasonOption.getAsString() : "Unspecified";
+
+        // Check that bot has necessary permissions
+        Role botRole = event.getGuild().getBotRole();
+        if (!CommandUtils.hasPermission(botRole, this.permission) || target.isOwner()) {
+            event.getHook().sendMessageEmbeds(EmbedUtils.createError("I couldn't kick that user. Please check my permissions and role position.")).queue();
+            return;
+        }
+
+        // Check if bot has a higher role than user
+        int botPos = botRole.getPosition();
+        for (Role role : target.getRoles()) {
+            if (role.getPosition() >= botPos) {
+                event.getHook().sendMessageEmbeds(EmbedUtils.createError("I couldn't kick that user. Please check my permissions and role position.")).queue();
+                return;
+            }
+        }
+
+        // Kick user from guild
+        user.openPrivateChannel().queue(privateChannel -> {
+            // Private message user with reason for kick
+            EmbedBuilder embed = new EmbedBuilder()
+                        .setColor(EmbedColor.ERROR.color)
+                        .setTitle(EmbedUtils.RED_X + " You were kicked!")
+                        .addField("Server", event.getGuild().getName(), false)
+                        .addField("Reason", reason, false)
+                        .setTimestamp(new Date().toInstant());
+            privateChannel.sendMessageEmbeds(embed.build()).queue(
+                    message -> target.kick(reason).queue(),
+                    failure -> target.kick(reason).queue()
+            );
+        }, fail -> target.kick(reason).queue());
+
+        // Send confirmation message
+        event.getHook().sendMessageEmbeds(new EmbedBuilder()
+                .setAuthor(user.getAsTag() + " has been kicked", null, user.getEffectiveAvatarUrl())
+                .setDescription("**Reason:** " + reason)
+                .setColor(EmbedColor.DEFAULT.color)
+                .build()
+        ).queue();
+    }
+}

src/main/java/technobot/commands/staff/RemoveWarnCommand.java

@@ -29,7 +29,7 @@ public RemoveWarnCommand(TechnoBot bot) {
         this.category = Category.STAFF;
         this.args.add(new OptionData(OptionType.USER, "user", "User to clear ALL warnings for"));
         this.args.add(new OptionData(OptionType.INTEGER, "id", "ID number for the warning to remove").setMinValue(1));
-        this.permission = Permission.MODERATE_MEMBERS;
+        this.permission = Permission.MANAGE_ROLES;
     }
 
     @Override

src/main/java/technobot/commands/staff/WarnCommand.java

@@ -32,7 +32,7 @@ public WarnCommand(TechnoBot bot) {
         this.category = Category.STAFF;
         this.args.add(new OptionData(OptionType.USER, "user", "The user to warn", true));
         this.args.add(new OptionData(OptionType.STRING, "reason", "Reason for the warning"));
-        this.permission = Permission.MODERATE_MEMBERS;
+        this.permission = Permission.MANAGE_ROLES;
     }
 
     @Override