diff --git a/README.md b/README.md
index 1116bc3..2945e0f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Hadder
-The Hadder Discord Bot is a multi-purpose Discord Bot.
+Hadder Discord is a multi-purpose Discord Bot with 100% uptime.
[](https://github.com/BigBotNetwork/Hadder)
diff --git a/pom.xml b/pom.xml
index cbb6bb5..5c14e85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
net.dv8tion
JDA
- 4.0.0_69
+ 4.0.0_70
org.json
diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java
index 43ca93f..7b35d9b 100644
--- a/src/main/java/com/bbn/hadder/listener/RulesListener.java
+++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java
@@ -19,24 +19,13 @@ public class RulesListener extends ListenerAdapter {
@Override
public void onMessageReactionAdd(MessageReactionAddEvent event) {
- if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) {
- if (event.getReactionEmote().isEmote()) {
- if (rethink.getRulesAEmote(event.getGuild().getId()).contains(event.getReactionEmote().getId())) {
+ 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 (rethink.getRulesDEmote(event.getGuild().getId()).contains(event.getReactionEmote().getId())) {
- event.getReaction().removeReaction(event.getUser()).queue();
- if (event.getGuild().getSelfMember().canInteract(event.getMember())) {
- event.getMember().kick().reason("Declined the rules");
- }
- }
- } else {
- if (event.getReactionEmote().getEmoji().equals(rethink.getRulesAEmote(event.getGuild().getId()))) {
- event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue();
- } else if (event.getReactionEmote().getEmoji().equals(rethink.getRulesDEmote(event.getGuild().getId()))) {
- event.getReaction().removeReaction(event.getUser()).queue();
- if (event.getGuild().getSelfMember().canInteract(event.getMember())) {
- event.getMember().kick().reason("Declined the rules");
- }
+ } else if (event.getReactionEmote().getEmoji().equals("❌") && event.getGuild().getSelfMember().canInteract(event.getMember())) {
+ event.getReaction().removeReaction().queue();
+ event.getMember().kick().reason("Declined the rules");
}
}
}
@@ -44,8 +33,10 @@ public class RulesListener extends ListenerAdapter {
@Override
public void onMessageReactionRemove(MessageReactionRemoveEvent event) {
- if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) {
+ if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId()))) {
+ if (!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();
+ }
}
}
}