* Added defer/reply for slash command

surajkumar · surajkumar · commit 4d32ce6f7c39 · 2024-05-27T15:07:34.000+01:00
* Fix performance with dynamic loading
* General cleanup
diff --git a/annotations/src/main/java/com/javadiscord/jdi/core/processor/ClassFileUtil.java b/annotations/src/main/java/com/javadiscord/jdi/core/processor/ClassFileUtil.java
@@ -12,22 +12,37 @@
 import javassist.bytecode.ClassFile;
 
 public class ClassFileUtil {
+    private static final List<File> classesInPath = new ArrayList<>();
 
     private ClassFileUtil() {}
 
     public static List<File> getClassesInClassPath() {
-        List<File> classes = new ArrayList<>();
+        if (!classesInPath.isEmpty()) {
+            return classesInPath;
+        }
         String classpath = System.getProperty("java.class.path");
         String[] classpathEntries = classpath.split(File.pathSeparator);
+
         for (String entry : classpathEntries) {
+            if (
+                entry.contains("io.netty")
+                    || entry.contains("org.apache")
+                    || entry.contains("io.vertx")
+                    || entry.contains("com.fasterxml")
+                    || entry.contains("org.javassist")
+                    || entry.contains("com.github.mizosoft.methanol")
+            ) {
+                continue;
+            }
+
             File file = new File(entry);
             try {
-                classes.addAll(getClasses(file));
+                classesInPath.addAll(getClasses(file));
             } catch (IOException ignore) {
                 /* Ignore */
             }
         }
-        return classes;
+        return classesInPath;
     }
 
     public static String getClassName(File file) throws IOException {
diff --git a/annotations/src/main/java/com/javadiscord/jdi/core/processor/SlashCommandLoader.java b/annotations/src/main/java/com/javadiscord/jdi/core/processor/SlashCommandLoader.java
@@ -25,18 +25,7 @@ private void loadInteractionListeners() {
         List<File> classes = ClassFileUtil.getClassesInClassPath();
         for (File classFile : classes) {
             try {
-
-                String name = ClassFileUtil.getClassName(classFile);
-                if (
-                    name.contains("io.netty")
-                        || name.contains("org.apache")
-                        || name.contains("io.vertx")
-                        || name.contains("com.fasterxml")
-                ) {
-                    continue;
-                }
-
-                Class<?> clazz = Class.forName(name);
+                Class<?> clazz = Class.forName(ClassFileUtil.getClassName(classFile));
 
                 Method[] methods = clazz.getMethods();
                 for (Method method : methods) {
diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/command/CallbackMessage.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/command/CallbackMessage.java
@@ -0,0 +1,110 @@
+package com.javadiscord.jdi.core.api.builders.command;
+
+import java.util.List;
+
+import com.javadiscord.jdi.core.models.channel.AllowedMentions;
+import com.javadiscord.jdi.core.models.channel.Attachment;
+import com.javadiscord.jdi.core.models.message.Component;
+import com.javadiscord.jdi.core.models.message.embed.Embed;
+import com.javadiscord.jdi.core.models.poll.Poll;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class CallbackMessage {
+    @JsonProperty("tts")
+    private boolean tts;
+
+    @JsonProperty("content")
+    private String content;
+
+    @JsonProperty("embeds")
+    private List<Embed> embeds;
+
+    @JsonProperty("allowed_mentions")
+    private AllowedMentions allowedMentions;
+
+    @JsonProperty("flags")
+    private int flags;
+
+    @JsonProperty("components")
+    private List<Component> components;
+
+    @JsonProperty("attachments")
+    private List<Attachment> attachments;
+
+    @JsonProperty("poll")
+    private Poll poll;
+
+    public CallbackMessage() {}
+
+    public boolean isTts() {
+        return tts;
+    }
+
+    public void setTts(boolean tts) {
+        this.tts = tts;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public CallbackMessage setContent(String content) {
+        this.content = content;
+        return this;
+    }
+
+    public List<Embed> getEmbeds() {
+        return embeds;
+    }
+
+    public CallbackMessage setEmbeds(List<Embed> embeds) {
+        this.embeds = embeds;
+        return this;
+    }
+
+    public AllowedMentions getAllowedMentions() {
+        return allowedMentions;
+    }
+
+    public CallbackMessage setAllowedMentions(AllowedMentions allowedMentions) {
+        this.allowedMentions = allowedMentions;
+        return this;
+    }
+
+    public int getFlags() {
+        return flags;
+    }
+
+    public CallbackMessage setFlags(int flags) {
+        this.flags = flags;
+        return this;
+    }
+
+    public List<Component> getComponents() {
+        return components;
+    }
+
+    public CallbackMessage setComponents(List<Component> components) {
+        this.components = components;
+        return this;
+    }
+
+    public List<Attachment> getAttachments() {
+        return attachments;
+    }
+
+    public CallbackMessage setAttachments(List<Attachment> attachments) {
+        this.attachments = attachments;
+        return this;
+    }
+
+    public Poll getPoll() {
+        return poll;
+    }
+
+    public CallbackMessage setPoll(Poll poll) {
+        this.poll = poll;
+        return this;
+    }
+}
diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/command/CallbackMessageBuilder.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/command/CallbackMessageBuilder.java
@@ -0,0 +1,41 @@
+package com.javadiscord.jdi.core.api.builders.command;
+
+import java.util.Optional;
+
+import com.javadiscord.jdi.internal.api.application_commands.EditCommandRequest;
+import com.javadiscord.jdi.internal.api.application_commands.RespondCommandRequest;
+
+public class CallbackMessageBuilder {
+    private final CallbackResponseType type;
+    private final long interactionId;
+    private final String interactionToken;
+    private Optional<CallbackMessage> message;
+    private long applicationId;
+
+    public CallbackMessageBuilder(
+        CallbackResponseType type, long interactionId, String interactionToken
+    ) {
+        this.type = type;
+        this.interactionId = interactionId;
+        this.interactionToken = interactionToken;
+        this.message = Optional.empty();
+    }
+
+    public CallbackMessageBuilder message(CallbackMessage message) {
+        this.message = Optional.of(message);
+        return this;
+    }
+
+    public CallbackMessageBuilder applicationId(long applicationId) {
+        this.applicationId = applicationId;
+        return this;
+    }
+
+    public RespondCommandRequest build() {
+        return new RespondCommandRequest(type, message, interactionId, interactionToken);
+    }
+
+    public EditCommandRequest buildEdit() {
+        return new EditCommandRequest(type, message, applicationId, interactionToken);
+    }
+}
diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/command/CallbackResponseType.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/command/CallbackResponseType.java
@@ -0,0 +1,22 @@
+package com.javadiscord.jdi.core.api.builders.command;
+
+public enum CallbackResponseType {
+    PONG(1),
+    CHANNEL_MESSAGE_WITH_SOURCE(4),
+    DEFERRED_CHANNEL_MESSAGE_WITH_SOURCE(5),
+    DEFERRED_UPDATE_MESSAGE(6),
+    UPDATE_MESSAGE(7),
+    APPLICATION_COMMAND_AUTOCOMPLETE_RESULT(8),
+    MODAL(9),
+    PREMIUM_REQUIRED(10);
+
+    private final int value;
+
+    CallbackResponseType(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+}
diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/application_commands/EditCommandRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/application_commands/EditCommandRequest.java
@@ -1,12 +1,56 @@
 package com.javadiscord.jdi.internal.api.application_commands;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import com.javadiscord.jdi.core.api.builders.command.CallbackMessage;
+import com.javadiscord.jdi.core.api.builders.command.CallbackResponseType;
 import com.javadiscord.jdi.internal.api.DiscordRequest;
 import com.javadiscord.jdi.internal.api.DiscordRequestBuilder;
 
-public record EditCommandRequest() implements DiscordRequest {
+public record EditCommandRequest(
+    CallbackResponseType type,
+    Optional<CallbackMessage> message,
+    long applicationId,
+    String interactionToken
+) implements DiscordRequest {
 
     @Override
     public DiscordRequestBuilder create() {
-        return null;
+        Map<String, Object> body = new HashMap<>();
+        body.put("type", type.getValue());
+
+        message.ifPresent(m -> {
+            body.put("tts", m.isTts());
+            body.put("content", m.getContent());
+
+            if (m.getEmbeds() != null) {
+                body.put("embeds", m.getEmbeds());
+            }
+
+            if (m.getAllowedMentions() != null) {
+                body.put("allowed_mentions", m.getAllowedMentions());
+            }
+
+            body.put("flags", m.getFlags());
+
+            if (m.getComponents() != null) {
+                body.put("components", m.getComponents());
+            }
+
+            if (m.getAttachments() != null) {
+                body.put("attachments", m.getAttachments());
+            }
+
+            if (m.getPoll() != null) {
+                body.put("poll", m.getPoll());
+            }
+        });
+
+        return new DiscordRequestBuilder()
+            .patch()
+            .body(body)
+            .path("/webhooks/%s/%s/messages/@original".formatted(applicationId, interactionToken));
     }
 }
diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/application_commands/RespondCommandRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/application_commands/RespondCommandRequest.java
@@ -0,0 +1,32 @@
+package com.javadiscord.jdi.internal.api.application_commands;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import com.javadiscord.jdi.core.api.builders.command.CallbackMessage;
+import com.javadiscord.jdi.core.api.builders.command.CallbackResponseType;
+import com.javadiscord.jdi.internal.api.DiscordRequest;
+import com.javadiscord.jdi.internal.api.DiscordRequestBuilder;
+
+public record RespondCommandRequest(
+    CallbackResponseType type,
+    Optional<CallbackMessage> message,
+    long interactionId,
+    String interactionToken
+) implements DiscordRequest {
+
+    @Override
+    public DiscordRequestBuilder create() {
+
+        Map<String, Object> body = new HashMap<>();
+        body.put("type", type.getValue());
+
+        message.ifPresent(m -> body.put("data", m));
+
+        return new DiscordRequestBuilder()
+            .post()
+            .body(body)
+            .path("/interactions/%s/%s/callback".formatted(interactionId, interactionToken));
+    }
+}
diff --git a/core/src/main/java/com/javadiscord/jdi/core/interaction/SlashCommandEvent.java b/core/src/main/java/com/javadiscord/jdi/core/interaction/SlashCommandEvent.java
diff --git a/example/echo-bot/src/main/java/com/javadiscord/jdi/example/ExampleSlashCommand.java b/example/echo-bot/src/main/java/com/javadiscord/jdi/example/ExampleSlashCommand.java
diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/message/MessageUpdateHandler.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/handlers/guild/message/MessageUpdateHandler.java
