All message components listeners are now attachable to messages

Javacord · Jul 22, 2021 · 6a62c3f · 6a62c3f
1 parent 6c78bc9
commit 6a62c3f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/javacord-api/src/main/java/org/javacord/api/listener/interaction/ButtonClickListener.java b/javacord-api/src/main/java/org/javacord/api/listener/interaction/ButtonClickListener.java
@@ -4,6 +4,7 @@
 import org.javacord.api.listener.GloballyAttachableListener;
 import org.javacord.api.listener.ObjectAttachableListener;
 import org.javacord.api.listener.channel.TextChannelAttachableListener;
+import org.javacord.api.listener.message.MessageAttachableListener;
 import org.javacord.api.listener.server.ServerAttachableListener;
 import org.javacord.api.listener.user.UserAttachableListener;
 
@@ -12,7 +13,7 @@
  */
 @FunctionalInterface
 public interface ButtonClickListener extends ServerAttachableListener, UserAttachableListener,
-        TextChannelAttachableListener, GloballyAttachableListener, ObjectAttachableListener {
+        TextChannelAttachableListener, MessageAttachableListener, GloballyAttachableListener, ObjectAttachableListener {
 
     /**
      * This method is called every time a button is clicked.

diff --git a/...i/src/main/java/org/javacord/api/listener/interaction/MessageComponentCreateListener.java b/...i/src/main/java/org/javacord/api/listener/interaction/MessageComponentCreateListener.java
@@ -4,6 +4,7 @@
 import org.javacord.api.listener.GloballyAttachableListener;
 import org.javacord.api.listener.ObjectAttachableListener;
 import org.javacord.api.listener.channel.TextChannelAttachableListener;
+import org.javacord.api.listener.message.MessageAttachableListener;
 import org.javacord.api.listener.server.ServerAttachableListener;
 import org.javacord.api.listener.user.UserAttachableListener;
 
@@ -12,7 +13,7 @@
  */
 @FunctionalInterface
 public interface MessageComponentCreateListener extends ServerAttachableListener, UserAttachableListener,
-        TextChannelAttachableListener, GloballyAttachableListener, ObjectAttachableListener {
+        TextChannelAttachableListener, MessageAttachableListener, GloballyAttachableListener, ObjectAttachableListener {
 
     /**
      * This method is called every time a message component interaction is created.

diff --git a/...ord-api/src/main/java/org/javacord/api/listener/interaction/SelectMenuChooseListener.java b/...ord-api/src/main/java/org/javacord/api/listener/interaction/SelectMenuChooseListener.java
@@ -4,6 +4,7 @@
 import org.javacord.api.listener.GloballyAttachableListener;
 import org.javacord.api.listener.ObjectAttachableListener;
 import org.javacord.api.listener.channel.TextChannelAttachableListener;
+import org.javacord.api.listener.message.MessageAttachableListener;
 import org.javacord.api.listener.server.ServerAttachableListener;
 import org.javacord.api.listener.user.UserAttachableListener;
 
@@ -12,7 +13,7 @@
  */
 @FunctionalInterface
 public interface SelectMenuChooseListener extends ServerAttachableListener, UserAttachableListener,
-        TextChannelAttachableListener, GloballyAttachableListener, ObjectAttachableListener {
+        TextChannelAttachableListener, MessageAttachableListener, GloballyAttachableListener, ObjectAttachableListener {
 
     /**
      * This method is called every time when one or more select menu options have been chosen.

diff --git a/...re/src/main/java/org/javacord/core/util/handler/interaction/InteractionCreateHandler.java b/...re/src/main/java/org/javacord/core/util/handler/interaction/InteractionCreateHandler.java
@@ -108,8 +108,10 @@ public void handle(JsonNode packet) {
             case MESSAGE_COMPONENT:
                 MessageComponentCreateEvent messageComponentCreateEvent =
                         new MessageComponentCreateEventImpl(interaction);
+                long messageId = messageComponentCreateEvent.getMessageComponentInteraction().getMessageId();
                 api.getEventDispatcher().dispatchMessageComponentCreateEvent(
                         server == null ? api : server,
+                        messageId,
                         server,
                         interaction.getChannel().orElse(null),
                         interaction.getUser(),
@@ -119,6 +121,7 @@ public void handle(JsonNode packet) {
                         ButtonClickEvent buttonClickEvent = new ButtonClickEventImpl(interaction);
                         api.getEventDispatcher().dispatchButtonClickEvent(
                                 server == null ? api : server,
+                                messageId,
                                 server,
                                 interaction.getChannel().orElse(null),
                                 interaction.getUser(),
@@ -128,6 +131,7 @@ public void handle(JsonNode packet) {
                         SelectMenuChooseEvent selectMenuChooseEvent = new SelectMenuChooseEventImpl(interaction);
                         api.getEventDispatcher().dispatchSelectMenuChooseEvent(
                                 server == null ? api : server,
+                                messageId,
                                 server,
                                 interaction.getChannel().orElse(null),
                                 interaction.getUser(),