From f18c5e7d2bd8716c216bef507d0a83b62405b0c0 Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 3 Jan 2020 15:59:32 +0100 Subject: [PATCH] Finally Fixed --- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- .../java/com/bbn/hadder/listener/RulesListener.java | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 3bf91a3..6ef9d10 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -196,11 +196,11 @@ public class Rethink { } public String getRulesAEmote(String guild_id) { - return this.get("server", "id", guild_id, "accept_emote").toString().replaceAll("\"", ""); + return (String) this.get("server", "id", guild_id, "accept_emote"); } public String getRulesDEmote(String guild_id) { - return this.get("server", "id", guild_id, "decline_emote").toString().replaceAll("\"", ""); + return (String) this.get("server", "id", guild_id, "decline_emote"); } public void setInviteDetection(String guild_id, boolean b) { diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java index 7b3cb0e..d71d1d4 100644 --- a/src/main/java/com/bbn/hadder/listener/RulesListener.java +++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java @@ -21,16 +21,23 @@ public class RulesListener extends ListenerAdapter { 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 (rethink.getRulesAEmote(event.getGuild().getId()).equals(event.getReactionEmote().getId())) { 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())) { + } else if (rethink.getRulesDEmote(event.getGuild().getId()).equals(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().isEmoji()) { - event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue(); + if (rethink.getRulesAEmote(event.getGuild().getId()).equals(event.getReactionEmote().getEmoji())) { + event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue(); + } else if (rethink.getRulesDEmote(event.getGuild().getId()).equals(event.getReactionEmote().getEmoji())) { + event.getReaction().removeReaction(event.getUser()).queue(); + if (event.getGuild().getSelfMember().canInteract(event.getMember())) { + event.getMember().kick().reason("Declined the rules"); + } + } } } }