From 1d668b3d1b0bd2f0287206bdf942ed45d4d1a97e Mon Sep 17 00:00:00 2001
From: morethanwords <thanwords24@gmail.com>
Date: Thu, 15 Oct 2020 12:37:03 +0300
Subject: [PATCH] Fix forwarded name from main channel Fix peer subtitle in
 chat list

---
 src/lib/appManagers/appDialogsManager.ts  | 7 ++++---
 src/lib/appManagers/appImManager.ts       | 4 ++--
 src/lib/appManagers/appMessagesManager.ts | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/lib/appManagers/appDialogsManager.ts b/src/lib/appManagers/appDialogsManager.ts
index 77f4a021..bd4e208e 100644
--- a/src/lib/appManagers/appDialogsManager.ts
+++ b/src/lib/appManagers/appDialogsManager.ts
@@ -693,15 +693,16 @@ export class AppDialogsManager {
   
       /* if(lastMessage.from_id == auth.id) { // You:  */
       if(peer._ != 'peerUser' && peerID != lastMessage.fromID) {
-        let sender = appUsersManager.getUser(lastMessage.fromID);
+        const sender = appPeersManager.getPeer(lastMessage.fromID);
         if(sender && sender.id) {
-          let senderBold = document.createElement('b');
+          const senderBold = document.createElement('b');
 
           let str = '';
           if(sender.id == $rootScope.myID) {
             str = 'You';
           } else {
-            str = sender.first_name || sender.last_name || sender.username;
+            //str = sender.first_name || sender.last_name || sender.username;
+            str = appPeersManager.getPeerTitle(lastMessage.fromID, true, true);
           }
 
           //senderBold.innerText = str + ': ';
diff --git a/src/lib/appManagers/appImManager.ts b/src/lib/appManagers/appImManager.ts
index 53515073..9c6445d2 100644
--- a/src/lib/appManagers/appImManager.ts
+++ b/src/lib/appManagers/appImManager.ts
@@ -2168,7 +2168,7 @@ export class AppImManager {
     if((this.peerID < 0 && !our) || message.fwd_from || message.reply_to_mid) { // chat
       let title = appPeersManager.getPeerTitle(message.fwdFromID || message.fromID);
 
-      const isForwardFromChannel = !message.fromID && message.fwd_from;
+      const isForwardFromChannel = message.from_id && message.from_id._ == 'peerChannel' && message.fromID == message.fwdFromID;
       
       let isHidden = message.fwd_from && !message.fwd_from.from_id && !message.fwd_from.channel_id;
       if(isHidden) {
@@ -2181,7 +2181,7 @@ export class AppImManager {
       //this.log(title);
       
       if((message.fwdFromID || message.fwd_from)) {
-        if(this.peerID != this.myID) {
+        if(this.peerID != this.myID && !isForwardFromChannel) {
           bubble.classList.add('forwarded');
         }
         
diff --git a/src/lib/appManagers/appMessagesManager.ts b/src/lib/appManagers/appMessagesManager.ts
index 98ccb5d4..a60859aa 100644
--- a/src/lib/appManagers/appMessagesManager.ts
+++ b/src/lib/appManagers/appMessagesManager.ts
@@ -2243,7 +2243,7 @@ export class AppMessagesManager {
 
       const fwdHeader = apiMessage.fwd_from;
       if(fwdHeader) {
-        if(peerID == myID) {
+        //if(peerID == myID) {
           if(fwdHeader.saved_from_peer && fwdHeader.saved_from_msg_id) {
             const savedFromPeerID = appPeersManager.getPeerID(fwdHeader.saved_from_peer);
             const savedFromMid = appMessagesIDsManager.getFullMessageID(fwdHeader.saved_from_msg_id, 
@@ -2252,9 +2252,9 @@ export class AppMessagesManager {
           }
 
           apiMessage.fromID = fwdHeader.channel_id ? -fwdHeader.channel_id : appPeersManager.getPeerID(fwdHeader.from_id);
-        } else {
+        /* } else {
           apiMessage.fwdPostID = fwdHeader.channel_post;
-        }
+        } */
 
         apiMessage.fwdFromID = fwdHeader.channel_id ? -fwdHeader.channel_id : appPeersManager.getPeerID(fwdHeader.from_id);