From a103f09daeeb7fbd0ee5e700ad21959b56edd383 Mon Sep 17 00:00:00 2001
From: zubiden <19638254+zubiden@users.noreply.github.com>
Date: Mon, 1 Jun 2026 01:15:44 +0200
Subject: [PATCH] Comments: Fix wrong thread info on forwards (#6962)

---
 src/api/gramjs/apiBuilders/messages.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/api/gramjs/apiBuilders/messages.ts b/src/api/gramjs/apiBuilders/messages.ts
index 9cbe0c543..6dedbfbc4 100644
--- a/src/api/gramjs/apiBuilders/messages.ts
+++ b/src/api/gramjs/apiBuilders/messages.ts
@@ -801,7 +801,11 @@ export function buildApiThreadInfo(
     channelId, replies, maxId = messageId, recentRepliers, comments, readMaxId,
   } = messageReplies;
 
-  const { fromId, channelPost } = messageForwardInfo || {};
+  const {
+    fromId, channelPost, savedFromPeer, savedFromMsgId,
+  } = messageForwardInfo || {};
+  const fromChannelPeer = savedFromPeer || fromId;
+  const fromMessageId = savedFromMsgId || channelPost;
 
   const apiChannelId = channelId ? buildApiPeerId(channelId, 'channel') : undefined;
   if (apiChannelId === DELETED_COMMENTS_CHANNEL_ID) {
@@ -830,8 +834,8 @@ export function buildApiThreadInfo(
     isCommentsInfo: false,
     chatId,
     threadId: messageId,
-    fromChannelId: fromId && channelPost ? getApiChatIdFromMtpPeer(fromId) : undefined,
-    fromMessageId: channelPost,
+    fromChannelId: fromChannelPeer && fromMessageId ? getApiChatIdFromMtpPeer(fromChannelPeer) : undefined,
+    fromMessageId,
   });
 }