Stop bot from sending enhance message when reacting to a non enhancem…

…ent emoji
Alan19 · Jul 23, 2019 · 7054aa2 · 7054aa2
1 parent 60997ec
commit 7054aa2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/main/java/listeners/PlotPointEnhancementListener.java b/src/main/java/listeners/PlotPointEnhancementListener.java
@@ -43,7 +43,7 @@ public void startListening() {
                     event.requestMessage().thenAcceptAsync(message -> {
                         if (reaction.getEmoji().equalsEmoji("\uD83C\uDDFD")) {
                             removeEnhancementEmojis(message);
-                        } else {
+                        } else if (new PlotPointEnhancementHelper().isEmojiNumberEmoji(reaction.getEmoji())) {
                             enhanceRoll(event, reaction, message);
                             //Wipe reactions and then add star emoji to show that it was enhanced with plot points
                             removeEnhancementEmojis(message);
@@ -149,8 +149,7 @@ private int getAddAmount(Emoji emoji) {
         int toAdd = 0;
         PlotPointEnhancementHelper helper = new PlotPointEnhancementHelper();
         if (emoji.isCustomEmoji()) {
-            String tag = emoji.asKnownCustomEmoji().get().getMentionTag();
-            String trimmedEmoji = tag.substring(2, tag.length() - 1);
+            String trimmedEmoji = helper.trimCustomEmoji(emoji.asKnownCustomEmoji().get());
             for (Map.Entry<Integer, String> emojiEntry : helper.getOneToTwelveEmojiMap().entrySet()) {
                 if (emojiEntry.getValue().equals(trimmedEmoji)) {
                     toAdd = emojiEntry.getKey();

diff --git a/src/main/java/logic/PlotPointEnhancementHelper.java b/src/main/java/logic/PlotPointEnhancementHelper.java
@@ -1,6 +1,8 @@
 package logic;
 
 import com.vdurmont.emoji.EmojiParser;
+import org.javacord.api.entity.emoji.Emoji;
+import org.javacord.api.entity.emoji.KnownCustomEmoji;
 import org.javacord.api.entity.message.Message;
 
 import java.util.SortedMap;
@@ -37,6 +39,21 @@ public void addPlotPointEnhancementEmojis(Message rollMessage) {
         rollMessage.addReaction("\uD83C\uDDFD");
     }
 
+    public boolean isEmojiNumberEmoji(Emoji emoji) {
+        if (emoji.isUnicodeEmoji() && emoji.asUnicodeEmoji().isPresent()) {
+            return oneToTwelveEmojiMap.values().contains(emoji.asUnicodeEmoji().get());
+        } else if (emoji.isKnownCustomEmoji() && emoji.asKnownCustomEmoji().isPresent()) {
+            String trimmedEmoji = trimCustomEmoji(emoji.asKnownCustomEmoji().get());
+            return oneToTwelveEmojiMap.values().contains(trimmedEmoji);
+        }
+        return false;
+    }
+
+    public String trimCustomEmoji(KnownCustomEmoji emoji) {
+        String tag = emoji.asKnownCustomEmoji().get().getMentionTag();
+        return tag.substring(2, tag.length() - 1);
+    }
+
     public String getCancelEmoji() {
         return cancelEmoji;
     }