From f6e8b98422cfe97d474bfc87eff117385eeea5cf Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Fri, 22 Nov 2019 15:22:13 -0800
Subject: [PATCH] Rules Command improvements

---
 .../hadder/commands/moderation/RulesCommand.java  |  2 +-
 .../com/bbn/hadder/listener/RulesListener.java    | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
index 1f4b47a..53f263b 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
@@ -153,7 +153,7 @@ public class RulesCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[]{"rules"};
+        return new String[]{"rules", "rule"};
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java
index d54edcf..5c225e6 100644
--- a/src/main/java/com/bbn/hadder/listener/RulesListener.java
+++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java
@@ -6,6 +6,7 @@ package com.bbn.hadder.listener;
 
 import com.bbn.hadder.Rethink;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
+import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
 public class RulesListener extends ListenerAdapter {
@@ -21,13 +22,25 @@ public class RulesListener extends ListenerAdapter {
         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()))).queue();
+                    event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue();
                 } else if (event.getReactionEmote().getEmoji().equals("❌")) {
                     if (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()) {
+                if (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();
+                }
+            }
+        }
+    }
 }