From fa52568dde30d2fb767bbd01d9079d29c3cef47a Mon Sep 17 00:00:00 2001
From: Mikhail Filimonov <overtakeful@gmail.com>
Date: Thu, 15 May 2025 09:11:30 +0100
Subject: [PATCH 1/2] peerId

---
 submodules/Postbox/Sources/MessageHistoryTable.swift | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/submodules/Postbox/Sources/MessageHistoryTable.swift b/submodules/Postbox/Sources/MessageHistoryTable.swift
index 507d313574..7d4bf2899e 100644
--- a/submodules/Postbox/Sources/MessageHistoryTable.swift
+++ b/submodules/Postbox/Sources/MessageHistoryTable.swift
@@ -2713,6 +2713,12 @@ final class MessageHistoryTable: Table {
         
         var associatedStories: [StoryId: CodableEntry] = [:]
         
+        if let threadId = message.threadId {
+            if let peer = peerTable.get(PeerId(threadId)) {
+                peers[peer.id] = peer
+            }
+        }
+        
         for media in parsedMedia {
             for peerId in media.peerIds {
                 if let peer = peerTable.get(peerId) {
@@ -2800,6 +2806,12 @@ final class MessageHistoryTable: Table {
             }
         }
         
+        if let threadId = message.threadId {
+            if let peer = peerTable.get(PeerId(threadId)) {
+                peers[peer.id] = peer
+            }
+        }
+        
         for media in message.media {
             for peerId in media.peerIds {
                 if let peer = peerTable.get(peerId) {

From 7afac7e0e9d853a8e178e75bf8ab581657748f78 Mon Sep 17 00:00:00 2001
From: Mikhail Filimonov <overtakeful@gmail.com>
Date: Mon, 19 May 2025 09:55:09 +0100
Subject: [PATCH 2/2] -bugfixes

---
 .../TelegramCore/Sources/Utils/PeerUtils.swift       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/submodules/TelegramCore/Sources/Utils/PeerUtils.swift b/submodules/TelegramCore/Sources/Utils/PeerUtils.swift
index d220929f38..04de12d0f6 100644
--- a/submodules/TelegramCore/Sources/Utils/PeerUtils.swift
+++ b/submodules/TelegramCore/Sources/Utils/PeerUtils.swift
@@ -455,6 +455,18 @@ public func peerViewMainPeer(_ view: PeerView) -> Peer? {
     }
 }
 
+public func peerViewMonoforumMainPeer(_ view: PeerView) -> Peer? {
+    if let peer = peerViewMainPeer(view) {
+        if let channel = peer as? TelegramChannel, channel.flags.contains(.isMonoforum), let linkedMonoforumId = channel.linkedMonoforumId {
+            return view.peers[linkedMonoforumId]
+        } else {
+            return peer
+        }
+    } else {
+        return nil
+    }
+}
+
 public extension RenderedPeer {
     convenience init(message: Message) {
         var peers = SimpleDictionary<PeerId, Peer>()