listen for deferReply() to be complete before further handling

Author: Kaleidox

src/main/java/org/comroid/interaction/adapter/jda/DiscordResponseChain.java

@@ -17,6 +17,8 @@
 import org.comroid.util.JdaUtil;
 import org.jspecify.annotations.Nullable;
 
+import java.util.concurrent.CompletableFuture;
+
 @Log
 enum DiscordResponseChain implements ResponseChain<MessageCreateData> {
     @Instance INSTANCE;
@@ -27,16 +29,16 @@ public Class<MessageCreateData> getResponseType() {
     }
 
     @Override
-    public void deferResponse(InteractionContext context) {
+    public CompletableFuture<?> deferResponse(InteractionContext context) {
         var privacy = privacy(context);
-        if (privacy == Interaction.PrivacyLevel.PRIVATE) return;
+        if (privacy == Interaction.PrivacyLevel.PRIVATE) return CompletableFuture.completedFuture(null);
 
-        context.component(IReplyCallback.class)
+        return context.component(IReplyCallback.class)
                 .assertion()
                 .deferReply()
                 .setEphemeral(privacy == Interaction.PrivacyLevel.EPHEMERAL)
                 .map(context::addChild)
-                .queue();
+                .submit();
     }
 
     @Override
@@ -84,6 +86,7 @@ public void sendResponse(InteractionContext context, MessageCreateData response)
         if (object instanceof Response response) return convertResponse(response);
         if (object instanceof EmbedBuilder builder) object = builder.build();
         if (object instanceof MessageEmbed embed) object = new MessageCreateBuilder().addEmbeds(embed);
+        if (object instanceof CharSequence chars) object = new MessageCreateBuilder().setContent(chars.toString());
         if (object instanceof MessageCreateBuilder builder) object = builder.build();
         if (object instanceof MessageCreateData data) return data;
         return null;
@@ -102,10 +105,10 @@ public MessageCreateData convertResponse(Response response) {
     }
 
     static Interaction.PrivacyLevel privacy(InteractionContext context) {
-        return context.component(Interaction.class).map(Interaction::privacy).orElse(Interaction.PrivacyLevel.EPHEMERAL);
+        return context.getNode().getInteraction().privacy();
     }
 
     static boolean async(InteractionContext context) {
-        return context.component(Interaction.class).filter(Interaction::async).isNonNull();
+        return context.getNode().getInteraction().async();
     }
 }

src/main/java/org/comroid/interaction/component/response/ResponseHandler.java

@@ -2,11 +2,14 @@
 
 import org.comroid.interaction.model.InteractionContext;
 
+import java.util.concurrent.CompletableFuture;
+
 public interface ResponseHandler<T> {
     Class<T> getResponseType();
 
     /// an implementation may choose to override this stub to provide additional context data for a deferred response on async interactions
-    default void deferResponse(InteractionContext context) {
+    default CompletableFuture<?> deferResponse(InteractionContext context) {
+        return CompletableFuture.completedFuture(null);
     }
 
     void sendResponse(InteractionContext context, T response);

src/main/java/org/comroid/interaction/model/InteractionContext.java

@@ -101,9 +101,10 @@ public void invoke() {
             if (components(PermissionAdapter.class).noneMatch(adp -> adp.verifyPermission(this))) throw Response.of("Insufficient permissions");
 
             if (node.getInteraction().async()) {
-                component(ResponseHandler.class).ifPresent(it -> it.deferResponse(this));
+                component(ResponseHandler.class).ifPresent(it -> it.deferResponse(this).join());
 
                 CompletableFuture.supplyAsync(() -> node.invoke(this)).thenAccept(this::handle).exceptionally(t -> {
+                    log.log(Level.FINE, "An internal error occurred during async interaction handling", t);
                     handle(t);
                     return null;
                 });