From 2eff728c2f05377441fa6a84398d34a70d1db09e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 31 Dec 2019 03:30:16 +0100 Subject: [PATCH] Error messages fix --- .../hadder/commands/moderation/InviteDetectCommand.java | 2 ++ .../hadder/commands/moderation/RegionChangeCommand.java | 4 ++-- .../com/bbn/hadder/commands/moderation/RoleCommand.java | 8 +++++--- .../java/com/bbn/hadder/commands/music/QueueCommand.java | 3 ++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java index 7dd147b..fb3c7a1 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -52,6 +52,8 @@ public class InviteDetectCommand implements Command { .build()).queue(); } break; + default: + event.getHelpCommand().sendHelp(this, event); } } else { event.getHelpCommand().sendHelp(this, event); diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java index f6bd71b..95f7fff 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java @@ -18,7 +18,7 @@ public class RegionChangeCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (args.length == 1) { - if (event.getMember().hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) { + if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_SERVER)) { switch (args[0].toLowerCase()) { case "amsterdam": setRegion(Region.AMSTERDAM, "Amsterdam", event); @@ -74,7 +74,7 @@ public class RegionChangeCommand implements Command { case "us-south": setRegion(Region.US_SOUTH, "US South", event); break; - case "list": + default: event.getTextChannel().sendMessage( event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, 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 7dedf44..de04cfd 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -15,8 +15,7 @@ public class RoleCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (args.length > 0) { - if (event.getMember().hasPermission(Permission.MANAGE_ROLES)) { - + if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) { String action = args[0].toLowerCase(); switch (action) { case "add": @@ -66,7 +65,7 @@ public class RoleCommand implements Command { event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.role.remove.success.title", - "✅", + "", "", "commands.moderation.role.remove.success.description", String.valueOf(event.getMessage().getMentionedRoles().size()), @@ -74,6 +73,9 @@ public class RoleCommand implements Command { .build()).queue(); } break; + default: + event.getHelpCommand().sendHelp(this, event); + break; } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java index dea68a1..cb96e27 100644 --- a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java @@ -28,7 +28,8 @@ public class QueueCommand implements Command { } event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.queue.success.title", "", - "commands.music.queue.success.description", builder.toString()).build()).queue(); + "commands.music.queue.success.description", builder.toString()) + .build()).queue(); } }