From 68303f1d9efdc3b0724d22409642452d3254da24 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 22 Nov 2019 13:11:34 -0800 Subject: [PATCH] Role remove Command but it's buggy --- .../commands/moderation/RoleCommand.java | 25 +++++++++++++++++-- .../java/com/bbn/hadder/utils/BotList.java | 2 +- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java index 506da00..9b69706 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -42,7 +42,28 @@ public class RoleCommand implements Command { break; case "remove": - event.getTextChannel().sendMessage("SOON").queue(); + if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() > 0) { + for (Member member : event.getMessage().getMentionedMembers()) { + for (Role role : event.getMessage().getMentionedRoles()) { + if (event.getGuild().getSelfMember().canInteract(member)) { + if (event.getGuild().getSelfMember().canInteract(role)) { + event.getGuild().removeRoleFromMember(member, role).reason("Role removed by " + event.getAuthor().getAsTag()).queue(); + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue(); + } + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue(); + } + } + } + EmbedBuilder builder = new EmbedBuilder(); + event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder) + .setTitle("✅ Successfully removed role(s) ✅") + .setDescription("I successfully removed " + event.getMessage().getMentionedRoles().size() + " roles from " + event.getMessage().getMentionedMembers().size() + " members.") + .build()).queue(); + } break; } } else { @@ -70,6 +91,6 @@ public class RoleCommand implements Command { @Override public String usage() { - return "<@role> <@user>"; + return "add/remove <@role> <@user>"; } } diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index be35045..a7faa6d 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -143,7 +143,7 @@ public class BotList { try { new OkHttpClient().newCall(discordextremelist).execute().close(); - System.out.println("Successfully posted count to the Discord Extreme List!"); + System.out.println("Successfully posted count for the Discord Extreme List!"); } catch (IOException e) { e.printStackTrace(); }