fix ephemeral messages

djobbo · Apr 13, 2024 · a573e39 · a573e39
1 parent a6eeaf1
commit a573e39
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/examples/rick-and-morty-api/src/index.tsx b/examples/rick-and-morty-api/src/index.tsx
@@ -25,7 +25,10 @@ const rickCmd = createSlashCommand("rick", "Rick and Morty characters info.")
         <App search={search} />
       </QueryClientProvider>
     ),
-    { unmountAfter: 300 },
+    {
+      unmountAfter: 300,
+      ephemeral: true,
+    },
   )
 
 client.registerCommand(rickCmd)

diff --git a/packages/reaccord/src/Client.ts b/packages/reaccord/src/Client.ts
@@ -13,6 +13,7 @@ export type MessageRenderOptions = {
    * @default 300 (5min)
    */
   unmountAfter?: number | null
+  ephemeral?: boolean
 }
 
 type ClientOptions = DiscordClientOptions & {

diff --git a/packages/reaccord/src/renderer/RootNode.tsx b/packages/reaccord/src/renderer/RootNode.tsx
@@ -106,7 +106,7 @@ export class RootNode extends ReaccordNode {
 
     this.ref = ref
 
-    const mergedMessageRenderOptions = {
+    this.messageRenderOptions = {
       ...(this.discordClient.messageRenderOptions ?? {}),
       ...messageRenderOptions,
     }
@@ -118,10 +118,10 @@ export class RootNode extends ReaccordNode {
       this.unmount()
     }
 
-    if (!!mergedMessageRenderOptions.unmountAfter) {
+    if (!!this.messageRenderOptions.unmountAfter) {
       timeout = setTimeout(() => {
         this.terminateInteraction()
-      }, mergedMessageRenderOptions.unmountAfter * 1000)
+      }, this.messageRenderOptions.unmountAfter * 1000)
     }
 
     this.reconcilerInstance.updateContainer(
@@ -154,6 +154,7 @@ export class RootNode extends ReaccordNode {
           } else if (this.ref instanceof BaseInteraction) {
             reply = await this.ref.reply({
               ...messageContent,
+              ephemeral: this.messageRenderOptions?.ephemeral ?? false,
               fetchReply: true,
             })
           } else {
@@ -181,7 +182,15 @@ export class RootNode extends ReaccordNode {
 
     if (!this.message.editable) throw new Error("Message is not editable")
 
-    await this.message.edit(messageContent)
+    if (this.messageRenderOptions?.ephemeral) {
+      if (!(this.ref instanceof BaseInteraction))
+        throw new Error("Can't send ephemeral message to non-interaction")
+
+      await this.ref.editReply(messageContent)
+    } else {
+      await this.message.edit(messageContent)
+    }
+
     return this.message
   }, MESSAGE_UPDATE_DEBOUNCE_MS)
 }