From 4e75be191abfd859faf6fb5f2b21262f3fb87706 Mon Sep 17 00:00:00 2001
From: Puechberty Arthur <arthur.puechberty@outlook.com>
Date: Sun, 12 Apr 2026 11:04:10 +0200
Subject: [PATCH] =?UTF-8?q?feat:=20am=C3=A9liorer=20la=20gestion=20des=20r?=
 =?UTF-8?q?=C3=A9ponses=20de=20message=20dans=20la=20commande=20de=20pr?=
 =?UTF-8?q?=C3=A9sence?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/commands/utility/presence.ts | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/commands/utility/presence.ts b/src/commands/utility/presence.ts
index 04095dc..2176816 100644
--- a/src/commands/utility/presence.ts
+++ b/src/commands/utility/presence.ts
@@ -213,6 +213,24 @@ const isMessageResult = (value: unknown): value is Message => {
   return "createMessageComponentCollector" in value && "edit" in value;
 };
 
+const resolveReplyMessage = (value: unknown): Message | null => {
+  if (isMessageResult(value)) {
+    return value;
+  }
+
+  if (!value || typeof value !== "object" || !("resource" in value)) {
+    return null;
+  }
+
+  const resource = (value as { resource?: unknown }).resource;
+  if (!resource || typeof resource !== "object" || !("message" in resource)) {
+    return null;
+  }
+
+  const message = (resource as { message?: unknown }).message;
+  return isMessageResult(message) ? message : null;
+};
+
 const persistAndApplyPresence = async (ctx: CommandExecutionContext, state: PresenceState): Promise<void> => {
   applyPresenceState(ctx.client, state);
   await savePresenceState(ctx.client, state);
@@ -243,15 +261,16 @@ export const presenceCommand = defineCommand({
     const replyResult = await ctx.reply({
       flags: MessageFlags.IsComponentsV2,
       components: [buildContainer(ctx, state, customIds)],
-      fetchReply: true,
+      withResponse: true,
     });
 
-    if (!isMessageResult(replyResult)) {
+    const replyMessage = resolveReplyMessage(replyResult);
+    if (!replyMessage) {
       return;
     }
 
     const ownerId = ctx.user.id;
-    const collector = replyResult.createMessageComponentCollector({ time: 15 * 60_000 });
+    const collector = replyMessage.createMessageComponentCollector({ time: 15 * 60_000 });
 
     collector.on("collect", async (interaction) => {
       if (interaction.user.id !== ownerId) {
@@ -338,7 +357,7 @@ export const presenceCommand = defineCommand({
 
             await submitted.deferUpdate();
 
-            await replyResult.edit({
+            await replyMessage.edit({
               flags: MessageFlags.IsComponentsV2,
               components: [buildContainer(ctx, state, customIds)],
             });
@@ -367,7 +386,7 @@ export const presenceCommand = defineCommand({
     });
 
     collector.on("end", async () => {
-      await replyResult
+      await replyMessage
         .edit({
           flags: MessageFlags.IsComponentsV2,
           components: [buildContainer(ctx, state, customIds, true)],