From d53068dd50f640f81b4d2b249e498999def49401 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 2 Dec 2019 08:47:48 +0100 Subject: [PATCH] Code improvements --- .../{misc => general}/EqualsCommand.java | 6 +++++- .../hadder/commands/general/HelpCommand.java | 2 +- .../{misc => general}/InviteCommand.java | 6 +++++- .../com/bbn/hadder/listener/RulesListener.java | 18 +++++++----------- 4 files changed, 18 insertions(+), 14 deletions(-) rename src/main/java/com/bbn/hadder/commands/{misc => general}/EqualsCommand.java (96%) rename src/main/java/com/bbn/hadder/commands/{misc => general}/InviteCommand.java (92%) diff --git a/src/main/java/com/bbn/hadder/commands/misc/EqualsCommand.java b/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java similarity index 96% rename from src/main/java/com/bbn/hadder/commands/misc/EqualsCommand.java rename to src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java index 71e6b47..d23bead 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/EqualsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java @@ -1,10 +1,14 @@ -package com.bbn.hadder.commands.misc; +package com.bbn.hadder.commands.general; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.EventWaiter; import com.bbn.hadder.utils.MessageEditor; +/* + * @author Skidder / GregTCLTK + */ + public class EqualsCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index f86dd29..bb7c868 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -47,7 +47,7 @@ public class HelpCommand implements Command { } else { for (Command cmd : event.getCommandHandler().getCommandList()) { for (String label : cmd.labels()) { - if (label.toLowerCase().equals(args[0])) { + if (label.equalsIgnoreCase(args[0])) { sendHelp(cmd, event.getRethink(), event.getAuthor(), event.getTextChannel()); } } diff --git a/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java similarity index 92% rename from src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java rename to src/main/java/com/bbn/hadder/commands/general/InviteCommand.java index a5c90ef..1d99179 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java @@ -1,4 +1,4 @@ -package com.bbn.hadder.commands.misc; +package com.bbn.hadder.commands.general; /* * @author Skidder / GregTCLTK @@ -9,6 +9,10 @@ import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; +/* + * @author Skidder / GregTCLTK + */ + public class InviteCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java index 7b35d9b..221ad4a 100644 --- a/src/main/java/com/bbn/hadder/listener/RulesListener.java +++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java @@ -19,24 +19,20 @@ public class RulesListener extends ListenerAdapter { @Override public void onMessageReactionAdd(MessageReactionAddEvent event) { - if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId()))) { - if (!event.getMember().getUser().isBot()) { - if (event.getReactionEmote().getEmoji().equals("✅")) { - event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue(); - } else if (event.getReactionEmote().getEmoji().equals("❌") && event.getGuild().getSelfMember().canInteract(event.getMember())) { - event.getReaction().removeReaction().queue(); - event.getMember().kick().reason("Declined the rules"); - } + if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) { + if (event.getReactionEmote().getEmoji().equals("✅")) { + event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue(); + } else if (event.getReactionEmote().getEmoji().equals("❌") && event.getGuild().getSelfMember().canInteract(event.getMember())) { + event.getReaction().removeReaction().queue(); + event.getMember().kick().reason("Declined the rules"); } } } @Override public void onMessageReactionRemove(MessageReactionRemoveEvent event) { - if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId()))) { - if (!event.getMember().getUser().isBot() && event.getReactionEmote().getEmoji().equals("✅")) { + if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot() && event.getReactionEmote().getEmoji().equals("✅")) { event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Withdrawal of the acceptance of the rules").queue(); - } } } }