Added SlashCommandEvent object for slash commands

Author: surajkumar

annotations/src/main/java/com/javadiscord/jdi/core/processor/SlashCommandValidator.java

@@ -21,7 +21,8 @@ public class SlashCommandValidator {
             new String[] {
                 "com.javadiscord.jdi.core.models.guild.Interaction",
                 "com.javadiscord.jdi.core.Discord",
-                "com.javadiscord.jdi.core.Guild"
+                "com.javadiscord.jdi.core.Guild",
+                "com.javadiscord.jdi.core.interaction.SlashCommandEvent"
             }
         );
     }

core/src/main/java/com/javadiscord/jdi/core/Discord.java

@@ -220,7 +220,8 @@ private void loadSlashCommands() {
                     if (parameters.getType().equals(Map.class)) {
                         eventListeners.add(
                             new InteractionEventHandler(
-                                constructor.newInstance(loadedSlashCommands)
+                                constructor.newInstance(loadedSlashCommands),
+                                this
                             )
                         );
                         return;
@@ -235,7 +236,7 @@ private void loadSlashCommands() {
 
     public void start() {
         started = true;
-      
+
         webSocketManager =
             new WebSocketManager(
                 new GatewaySetting().setApiVersion(10).setEncoding(GatewayEncoding.JSON),
@@ -260,7 +261,7 @@ public void stop() {
         if (this.webSocketManager != null) {
             this.webSocketManager.stop();
         }
-      
+
         LOGGER.info("Shutdown initiated");
 
         if (webSocketManager != null) {

core/src/main/java/com/javadiscord/jdi/core/GatewayEventListener.java

@@ -37,7 +37,7 @@ public GatewayEventListener(Discord discord) {
         this.discord = discord;
     }
 
-    static Guild getGuild(Discord discord, Object event) {
+    public static Guild getGuild(Discord discord, Object event) {
         if (event instanceof com.javadiscord.jdi.core.models.guild.Guild) {
             return new Guild(
                 (com.javadiscord.jdi.core.models.guild.Guild) event,

core/src/main/java/com/javadiscord/jdi/core/interaction/InteractionEventHandler.java

@@ -1,8 +1,13 @@
 package com.javadiscord.jdi.core.interaction;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.util.ArrayList;
+import java.util.List;
 
+import com.javadiscord.jdi.core.Discord;
 import com.javadiscord.jdi.core.EventListener;
+import com.javadiscord.jdi.core.GatewayEventListener;
 import com.javadiscord.jdi.core.Guild;
 import com.javadiscord.jdi.core.models.guild.Interaction;
 
@@ -12,9 +17,11 @@
 public class InteractionEventHandler implements EventListener {
     private static final Logger LOGGER = LogManager.getLogger(InteractionEventHandler.class);
     private final Object slashCommandLoader;
+    private final Discord discord;
 
-    public InteractionEventHandler(Object slashCommandLoader) {
+    public InteractionEventHandler(Object slashCommandLoader, Discord discord) {
         this.slashCommandLoader = slashCommandLoader;
+        this.discord = discord;
     }
 
     @Override
@@ -39,9 +46,32 @@ public void onInteractionCreate(Interaction interaction, Guild guild) {
                 (Class<?>) commandClassMethodInstance.getClass().getMethod("clazz")
                     .invoke(commandClassMethodInstance);
 
-            Method method =
-                (Method) commandClassMethodInstance.getClass().getMethod("method")
-                    .invoke(commandClassMethodInstance);
+            Method method = commandClassMethodInstance.getClass().getMethod("method");
+
+            List<Object> paramOrder = new ArrayList<>();
+            Parameter[] parameters = method.getParameters();
+            for (Parameter parameter : parameters) {
+                if (parameter.getParameterizedType() == interaction.getClass()) {
+                    paramOrder.add(interaction);
+                } else if (parameter.getParameterizedType() == Discord.class) {
+                    paramOrder.add(discord);
+                } else if (parameter.getParameterizedType() == Guild.class) {
+                    paramOrder.add(GatewayEventListener.getGuild(discord, interaction.guild()));
+                } else if (parameter.getParameterizedType() == SlashCommandEvent.class) {
+                    paramOrder.add(new SlashCommandEvent(interaction, discord));
+                }
+            }
+
+            if (paramOrder.size() != method.getParameterCount()) {
+                throw new RuntimeException(
+                    "Bound "
+                        + paramOrder.size()
+                        + " parameters but expected "
+                        + method.getParameterCount()
+                );
+            }
+
+            method.invoke(commandClassMethodInstance, paramOrder.toArray());
 
             Object handlerInstance = handler.getDeclaredConstructor().newInstance();
             method.invoke(handlerInstance);

core/src/main/java/com/javadiscord/jdi/core/interaction/SlashCommandEvent.java

@@ -0,0 +1,49 @@
+package com.javadiscord.jdi.core.interaction;
+
+import com.javadiscord.jdi.core.Discord;
+import com.javadiscord.jdi.core.GatewayEventListener;
+import com.javadiscord.jdi.core.Guild;
+import com.javadiscord.jdi.core.models.application.ApplicationCommandOption;
+import com.javadiscord.jdi.core.models.channel.Channel;
+import com.javadiscord.jdi.core.models.guild.Interaction;
+import com.javadiscord.jdi.core.models.guild.InteractionData;
+import com.javadiscord.jdi.core.models.guild.InteractionType;
+import com.javadiscord.jdi.core.models.user.User;
+
+public record SlashCommandEvent(Interaction interaction, Discord discord) {
+
+    public Channel channel() {
+        return interaction.channel();
+    }
+
+    public Guild guild() {
+        return GatewayEventListener.getGuild(discord, interaction.guild());
+    }
+
+    public User user() {
+        return interaction.user();
+    }
+
+    public InteractionType interactionType() {
+        return interaction.type();
+    }
+
+    public InteractionData interactionData() {
+        return interaction.data();
+    }
+
+    public Object option(String name) {
+        InteractionData interactionData = interaction.data();
+        ApplicationCommandOption[] options = interactionData.options();
+        for (ApplicationCommandOption option : options) {
+            if (option.name().equals(name)) {
+                return option.value();
+            }
+        }
+        return null;
+    }
+
+    public ApplicationCommandOption[] options() {
+        return interaction.data().options();
+    }
+}

example/echo-bot/src/main/java/com/javadiscord/jdi/example/ExampleSlashCommand.java

@@ -3,6 +3,8 @@
 import com.javadiscord.jdi.core.CommandOptionType;
 import com.javadiscord.jdi.core.annotations.CommandOption;
 import com.javadiscord.jdi.core.annotations.SlashCommand;
+import com.javadiscord.jdi.core.interaction.SlashCommandEvent;
+import com.javadiscord.jdi.core.models.application.ApplicationCommandOption;
 
 public class ExampleSlashCommand {
 
@@ -22,7 +24,10 @@ public class ExampleSlashCommand {
             ),
         }
     )
-    public void handle() {
-        // TODO: Logic to handle the slash command
+    public void handle(SlashCommandEvent event) {
+        ApplicationCommandOption[] options = event.options();
+        for (ApplicationCommandOption option : options) {
+            System.out.println("Received " + option.name() + " value " + option.value());
+        }
     }
 }

models/src/main/java/com/javadiscord/jdi/core/models/guild/InteractionData.java

@@ -12,6 +12,6 @@ public record InteractionData(
     @JsonProperty("type") int type,
     @JsonProperty("resolved") ResolvedData resolved,
     @JsonProperty("options") ApplicationCommandOption[] options,
-    @JsonProperty("guild_id") Long guildId,
-    @JsonProperty("target_id") Long targetId
+    @JsonProperty("guild_id") long guildId,
+    @JsonProperty("target_id") long targetId
 ) {}