From edaac0c33adb27d1bd3acb52f7d50c639a90ddef Mon Sep 17 00:00:00 2001 From: Logan Fick Date: Tue, 4 Jun 2019 13:03:48 -0400 Subject: [PATCH] Made reaction timeout emoji only get added if message has registered callbacks. --- .../logalbot/utils/ReactionCallbackManager.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/dev/logal/logalbot/utils/ReactionCallbackManager.java b/src/main/java/dev/logal/logalbot/utils/ReactionCallbackManager.java index 64586a1..a581144 100644 --- a/src/main/java/dev/logal/logalbot/utils/ReactionCallbackManager.java +++ b/src/main/java/dev/logal/logalbot/utils/ReactionCallbackManager.java @@ -49,8 +49,8 @@ public final class ReactionCallbackManager { } public static final void setCallbackTarget(final Message message, final User user) { - Checks.notNull(user, "User"); Checks.notNull(message, "Messsage"); + Checks.notNull(user, "User"); targetDictionary.put(message.getIdLong(), user.getIdLong()); } @@ -58,14 +58,16 @@ public final class ReactionCallbackManager { public static final void unregisterMessage(final Message message, final boolean delete) { Checks.notNull(message, "Message"); - callbackDictionary.remove(message.getIdLong()); - targetDictionary.remove(message.getIdLong()); - if (delete) { message.delete().queue(); } else { - message.addReaction(EmojiManager.getForAlias("no_entry").getUnicode()).queue(); + if (callbackDictionary.containsKey(message.getIdLong())) { + message.addReaction(EmojiManager.getForAlias("no_entry").getUnicode()).queue(); + } } + + callbackDictionary.remove(message.getIdLong()); + targetDictionary.remove(message.getIdLong()); } public static final void executeCallback(final long messageID, final TextChannel channel, final Member reactor,