onMessageSent -> onMessageReceived, minor improvement on adapter

Together-Java · Jan 20, 2022 · d130924 · d130924
1 parent 0608574
commit d130924
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/MessageReceiver.java b/application/src/main/java/org/togetherjava/tjbot/commands/MessageReceiver.java
@@ -17,13 +17,13 @@
  */
 public interface MessageReceiver extends Feature {
     /**
-     * Triggered by the core system whenever a new message was sent in a text channel of a guild the
-     * bot has been added to.
+     * Triggered by the core system whenever a new message was sent and received in a text channel
+     * of a guild the bot has been added to.
      *
      * @param event the event that triggered this, containing information about the corresponding
-     *        message that was sent
+     *        message that was sent and received
      */
-    void onMessageSent(@NotNull GuildMessageReceivedEvent event);
+    void onMessageReceived(@NotNull GuildMessageReceivedEvent event);
 
     /**
      * Triggered by the core system whenever an existing message was edited in a text channel of a

diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/MessageReceiverAdapter.java b/application/src/main/java/org/togetherjava/tjbot/commands/MessageReceiverAdapter.java
@@ -8,15 +8,15 @@
  * Adapter implementation of a {@link MessageReceiver}. A new receiver can then be registered by
  * adding it to {@link Features}.
  * <p>
- * {@link #onMessageSent(GuildMessageReceivedEvent)} and
+ * {@link #onMessageReceived(GuildMessageReceivedEvent)} and
  * {@link #onMessageUpdated(GuildMessageUpdateEvent)} can be overridden if desired. The default
  * implementation is empty, the adapter will not react to such events.
  */
 public abstract class MessageReceiverAdapter implements MessageReceiver {
 
     @SuppressWarnings("NoopMethodInAbstractClass")
     @Override
-    public void onMessageSent(@NotNull GuildMessageReceivedEvent event) {
+    public void onMessageReceived(@NotNull GuildMessageReceivedEvent event) {
         // Adapter does not react by default, subclasses may change this behavior
     }
 

diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java b/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java
@@ -4,13 +4,15 @@
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.events.GenericEvent;
 import net.dv8tion.jda.api.events.ReadyEvent;
 import net.dv8tion.jda.api.events.interaction.ButtonClickEvent;
 import net.dv8tion.jda.api.events.interaction.SelectionMenuEvent;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageUpdateEvent;
 import net.dv8tion.jda.api.exceptions.ErrorHandler;
+import net.dv8tion.jda.api.hooks.EventListener;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
@@ -282,21 +284,20 @@ private interface TriConsumer<A, B, C> {
         void accept(A first, B second, C third);
     }
 
-    private static final class MessageReceiverAsEventListener extends ListenerAdapter {
+    private static final class MessageReceiverAsEventListener implements EventListener {
         private final MessageReceiver messageReceiver;
 
         MessageReceiverAsEventListener(MessageReceiver messageReceiver) {
             this.messageReceiver = messageReceiver;
         }
 
         @Override
-        public void onGuildMessageReceived(@NotNull GuildMessageReceivedEvent event) {
-            messageReceiver.onMessageSent(event);
-        }
-
-        @Override
-        public void onGuildMessageUpdate(@NotNull GuildMessageUpdateEvent event) {
-            messageReceiver.onMessageUpdated(event);
+        public void onEvent(@NotNull GenericEvent event) {
+            if (event instanceof GuildMessageReceivedEvent receivedEvent) {
+                messageReceiver.onMessageReceived(receivedEvent);
+            } else if (event instanceof GuildMessageUpdateEvent updateEvent) {
+                messageReceiver.onMessageUpdated(updateEvent);
+            }
         }
     }
 }