More QoL updates

Author: devoxin

src/main/kotlin/me/devoxin/flight/api/context/Context.kt

@@ -2,6 +2,7 @@ package me.devoxin.flight.api.context
 
 import me.devoxin.flight.api.CommandClient
 import me.devoxin.flight.internal.entities.Executable
+import net.dv8tion.jda.api.EmbedBuilder
 import net.dv8tion.jda.api.JDA
 import net.dv8tion.jda.api.entities.Guild
 import net.dv8tion.jda.api.entities.Member
@@ -37,11 +38,30 @@ interface Context {
     val guildChannel: GuildMessageChannel?
     val isFromGuild: Boolean
 
+    /**
+     * Sends "Bot is thinking..." for slash commands, or a typing indicator for message commands.
+     */
+    fun think(ephemeral: Boolean = false): CompletableFuture<*> {
+        return asSlashContext?.defer0(ephemeral)
+            ?: messageChannel.sendTyping().submit()
+    }
+
+    /**
+     * Responds to the event. This differs from [send] in that it'll fulfill the "Bot is thinking..." message
+     * for slash commands.
+     */
     fun respond(content: String): CompletableFuture<*> {
         return asSlashContext?.respond0(MessageCreateData.fromContent(content))
             ?: messageChannel.sendMessage(content).submit()
     }
 
+    fun respond(embed: EmbedBuilder.() -> Unit): CompletableFuture<*> {
+        val create = MessageCreateData.fromEmbeds(EmbedBuilder().apply(embed).build())
+
+        return asSlashContext?.respond0(create)
+            ?: messageChannel.sendMessage(create).submit()
+    }
+
     fun respond(message: MessageCreateData): CompletableFuture<*> {
         return asSlashContext?.respond0(message)
             ?: messageChannel.sendMessage(message).submit()

src/main/kotlin/me/devoxin/flight/api/context/MessageContext.kt

@@ -15,6 +15,7 @@ import net.dv8tion.jda.api.requests.RestAction
 import net.dv8tion.jda.api.utils.FileUpload
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder
 import net.dv8tion.jda.api.utils.messages.MessageCreateData
+import java.util.concurrent.CompletableFuture
 import java.util.regex.Pattern
 
 class MessageContext(

src/main/kotlin/me/devoxin/flight/api/context/SlashContext.kt

@@ -32,19 +32,18 @@ class SlashContext(
         private set
 
     fun defer(ephemeral: Boolean = false) {
-        if (!deferred) { // Idempotency handling
-            event.deferReply(ephemeral).queue { deferred = true }
-        }
+        defer0(ephemeral)
     }
 
-    suspend fun deferAsync(ephemeral: Boolean): InteractionHook {
+    suspend fun deferAsync(ephemeral: Boolean = false) = defer0(ephemeral).await()
+
+    internal fun defer0(ephemeral: Boolean): CompletableFuture<InteractionHook> {
         if (!deferred) { // Idempotency handling
             return event.deferReply(ephemeral).submit()
                 .thenApply { deferred = true; it }
-                .await()
         }
 
-        return event.hook
+        return CompletableFuture.completedFuture(event.hook)
     }
 
     fun reply(content: String, ephemeral: Boolean = false) {