Add followup messages and methods for deleting & editing responses

Author: cerus

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.cerus</groupId>
     <artifactId>jda-slash-commands</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

src/main/java/de/cerus/jdasc/JDASlashCommands.java

@@ -127,7 +127,7 @@ public static CompletableFuture<Long> submitGuildCommand(final ApplicationComman
      */
     public static CompletableFuture<Void> submitInteractionResponse(final Interaction interaction, final InteractionResponse response) {
         final CompletableFuture<Void> future = new CompletableFuture<>();
-        discordHttpClient.submitInteractionReply(interaction, response).whenComplete((rsp, t) -> {
+        discordHttpClient.submitInteractionResponse(interaction, response).whenComplete((rsp, t) -> {
             if (t != null) {
                 future.completeExceptionally(t);
             } else {

src/main/java/de/cerus/jdasc/http/DiscordHttpClient.java

@@ -2,13 +2,16 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
 import de.cerus.jdasc.command.ApplicationCommand;
 import de.cerus.jdasc.command.ApplicationCommandOptionType;
 import de.cerus.jdasc.gson.ApplicationCommandOptionTypeTypeAdapter;
 import de.cerus.jdasc.gson.InteractionResponseTypeAdapter;
 import de.cerus.jdasc.gson.InteractionResponseTypeTypeAdapter;
 import de.cerus.jdasc.gson.MessageEmbedTypeAdapter;
 import de.cerus.jdasc.interaction.Interaction;
+import de.cerus.jdasc.interaction.followup.FollowupMessage;
+import de.cerus.jdasc.interaction.response.InteractionApplicationCommandCallbackData;
 import de.cerus.jdasc.interaction.response.InteractionResponse;
 import de.cerus.jdasc.interaction.response.InteractionResponseType;
 import java.io.IOException;
@@ -27,7 +30,6 @@
 public class DiscordHttpClient {
 
     private final Gson gson;
-
     private final String applicationId;
     private final String botToken;
     private final ExecutorService executorService;
@@ -60,7 +62,57 @@ public DiscordHttpClient(final JDA jda, final String applicationId, final String
                 .create();
     }
 
-    public CompletableFuture<Response> submitInteractionReply(final Interaction interaction, final InteractionResponse response) {
+    public CompletableFuture<Response> deleteFollowupMessage(final Interaction interaction, final long messageId) {
+        return this.execute(new Request.Builder()
+                .url(String.format("https://discord.com/api/v8/webhooks/%s/%s/messages/%d", this.applicationId, interaction.getToken(), messageId))
+                .delete()
+                .addHeader("Authorization", "Bot " + this.botToken)
+                .build(), 200, 204);
+    }
+
+    public CompletableFuture<Response> editFollowupMessage(final Interaction interaction, final long messageId, final FollowupMessage message) {
+        final JsonObject jsonObject = this.gson.toJsonTree(message).getAsJsonObject();
+        jsonObject.remove("tts");
+        jsonObject.remove("username");
+        jsonObject.remove("avatar_url");
+        final String body = jsonObject.toString();
+
+        return this.execute(new Request.Builder()
+                .url(String.format("https://discord.com/api/v8/webhooks/%s/%s/messages/%d", this.applicationId, interaction.getToken(), messageId))
+                .patch(RequestBody.create(body, MediaType.get("application/json; charset=utf-8")))
+                .addHeader("Authorization", "Bot " + this.botToken)
+                .build(), 200, 204);
+    }
+
+    public CompletableFuture<Response> submitFollowupMessage(final Interaction interaction, final FollowupMessage message) {
+        final String body = this.gson.toJson(message);
+        return this.execute(new Request.Builder()
+                .url(String.format("https://discord.com/api/v8/webhooks/%s/%s", this.applicationId, interaction.getToken()))
+                .post(RequestBody.create(body, MediaType.get("application/json; charset=utf-8")))
+                .addHeader("Authorization", "Bot " + this.botToken)
+                .build(), 200, 204, 201);
+    }
+
+    public CompletableFuture<Response> deleteInteractionResponse(final Interaction interaction) {
+        return this.execute(new Request.Builder()
+                .url(String.format("https://discord.com/api/v8/webhooks/%s/%s/messages/@original", this.applicationId, interaction.getToken()))
+                .delete()
+                .addHeader("Authorization", "Bot " + this.botToken)
+                .build(), 204);
+    }
+
+    public CompletableFuture<Response> editInteractionResponse(final Interaction interaction, final InteractionApplicationCommandCallbackData data) {
+        final JsonObject payload = this.gson.toJsonTree(data).getAsJsonObject();
+        payload.remove("tts");
+        final String body = payload.toString();
+        return this.execute(new Request.Builder()
+                .url(String.format("https://discord.com/api/v8/webhooks/%s/%s/messages/@original", this.applicationId, interaction.getToken()))
+                .patch(RequestBody.create(body, MediaType.get("application/json; charset=utf-8")))
+                .addHeader("Authorization", "Bot " + this.botToken)
+                .build(), 200, 204);
+    }
+
+    public CompletableFuture<Response> submitInteractionResponse(final Interaction interaction, final InteractionResponse response) {
         final String body = this.gson.toJson(response);
         return this.execute(new Request.Builder()
                 .url(String.format("https://discord.com/api/v8/interactions/%d/%s/callback", interaction.getId(), interaction.getToken()))

src/main/java/de/cerus/jdasc/interaction/followup/FollowupMessage.java

@@ -0,0 +1,51 @@
+package de.cerus.jdasc.interaction.followup;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import net.dv8tion.jda.api.entities.MessageEmbed;
+
+/**
+ * Represents a followup message. Basically the same as a webhook message.
+ */
+public class FollowupMessage {
+
+    private final String content;
+    private final String username;
+    @SerializedName("avatar_url")
+    private final String avatarUrl;
+    private final boolean tts;
+    private final List<MessageEmbed> embeds;
+
+    public FollowupMessage(final String content,
+                           final String username,
+                           final String avatarUrl,
+                           final boolean tts,
+                           final List<MessageEmbed> embeds) {
+        this.content = content;
+        this.username = username;
+        this.avatarUrl = avatarUrl;
+        this.tts = tts;
+        this.embeds = embeds;
+    }
+
+    public String getContent() {
+        return this.content;
+    }
+
+    public String getUsername() {
+        return this.username;
+    }
+
+    public String getAvatarUrl() {
+        return this.avatarUrl;
+    }
+
+    public boolean isTts() {
+        return this.tts;
+    }
+
+    public List<MessageEmbed> getEmbeds() {
+        return this.embeds;
+    }
+
+}