From c59ae1527cae86dfc0aa36f7305e5bbb025edb4b Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 13 Mar 2026 22:24:03 +0000
Subject: [PATCH] refactor: share discord trailing media delivery

---
 src/discord/monitor/reply-delivery.ts | 36 +++++++++++----------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/discord/monitor/reply-delivery.ts b/src/discord/monitor/reply-delivery.ts
index fb235ca65..d34381454 100644
--- a/src/discord/monitor/reply-delivery.ts
+++ b/src/discord/monitor/reply-delivery.ts
@@ -336,6 +336,18 @@ export async function deliverDiscordReply(params: {
     if (!firstMedia) {
       continue;
     }
+    const sendRemainingMedia = () =>
+      sendAdditionalDiscordMedia({
+        cfg: params.cfg,
+        target: params.target,
+        token: params.token,
+        rest: params.rest,
+        accountId: params.accountId,
+        mediaUrls: mediaList.slice(1),
+        mediaLocalRoots: params.mediaLocalRoots,
+        resolveReplyTo,
+        retryConfig,
+      });
 
     // Voice message path: audioAsVoice flag routes through sendVoiceMessageDiscord.
     if (payload.audioAsVoice) {
@@ -367,17 +379,7 @@ export async function deliverDiscordReply(params: {
         retryConfig,
       });
       // Additional media items are sent as regular attachments (voice is single-file only).
-      await sendAdditionalDiscordMedia({
-        cfg: params.cfg,
-        target: params.target,
-        token: params.token,
-        rest: params.rest,
-        accountId: params.accountId,
-        mediaUrls: mediaList.slice(1),
-        mediaLocalRoots: params.mediaLocalRoots,
-        resolveReplyTo,
-        retryConfig,
-      });
+      await sendRemainingMedia();
       continue;
     }
 
@@ -392,17 +394,7 @@ export async function deliverDiscordReply(params: {
       replyTo,
     });
     deliveredAny = true;
-    await sendAdditionalDiscordMedia({
-      cfg: params.cfg,
-      target: params.target,
-      token: params.token,
-      rest: params.rest,
-      accountId: params.accountId,
-      mediaUrls: mediaList.slice(1),
-      mediaLocalRoots: params.mediaLocalRoots,
-      resolveReplyTo,
-      retryConfig,
-    });
+    await sendRemainingMedia();
   }
 
   if (binding && deliveredAny) {