From c6e630d5e0f837dac3ea94957a982677605a0980 Mon Sep 17 00:00:00 2001
From: zubiden <19638254+zubiden@users.noreply.github.com>
Date: Wed, 27 Nov 2024 20:33:37 +0400
Subject: [PATCH] Message: Fix incorrect sender preview when forwarding with
 Send As (#5215)

---
 src/api/gramjs/apiBuilders/messages.ts | 6 ++++--
 src/api/gramjs/methods/messages.ts     | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/api/gramjs/apiBuilders/messages.ts b/src/api/gramjs/apiBuilders/messages.ts
index f797b2f1e..80f3148ba 100644
--- a/src/api/gramjs/apiBuilders/messages.ts
+++ b/src/api/gramjs/apiBuilders/messages.ts
@@ -996,6 +996,7 @@ export function buildLocalForwardedMessage({
   noCaptions,
   isCurrentUserPremium,
   lastMessageId,
+  sendAs,
 }: {
   toChat: ApiChat;
   toThreadId?: number;
@@ -1005,6 +1006,7 @@ export function buildLocalForwardedMessage({
   noCaptions?: boolean;
   isCurrentUserPremium?: boolean;
   lastMessageId?: number;
+  sendAs?: ApiPeer;
 }): ApiMessage {
   const localId = getNextLocalMessageId(lastMessageId);
   const {
@@ -1049,7 +1051,7 @@ export function buildLocalForwardedMessage({
     content: updatedContent,
     date: scheduledAt || Math.round(Date.now() / 1000) + getServerTimeOffset(),
     isOutgoing: !asIncomingInChatWithSelf && toChat.type !== 'chatTypeChannel',
-    senderId: currentUserId,
+    senderId: sendAs?.id || currentUserId,
     sendingState: 'messageSendingStatePending',
     groupedId,
     isInAlbum,
@@ -1059,7 +1061,7 @@ export function buildLocalForwardedMessage({
     ...(toThreadId && toChat?.isForum && { isTopicReply: true }),
 
     ...(emojiOnlyCount && { emojiOnlyCount }),
-    // Forward info doesn't get added when users forwards his own messages, also when forwarding audio
+    // Forward info doesn't get added when user forwards own messages and when forwarding audio
     ...(message.chatId !== currentUserId && !isAudio && !noAuthors && {
       forwardInfo: {
         date: message.forwardInfo?.date || message.date,
diff --git a/src/api/gramjs/methods/messages.ts b/src/api/gramjs/methods/messages.ts
index b9aef66a2..9aba1b4d8 100644
--- a/src/api/gramjs/methods/messages.ts
+++ b/src/api/gramjs/methods/messages.ts
@@ -1527,6 +1527,7 @@ export async function forwardMessages({
       noCaptions,
       isCurrentUserPremium,
       lastMessageId,
+      sendAs,
     });
     localMessages[randomIds[index].toString()] = localMessage;