From c2d84dc649137d7073bb04715a9bf48c93185f9b Mon Sep 17 00:00:00 2001
From: Ali <>
Date: Wed, 12 Oct 2022 19:51:15 +0400
Subject: [PATCH] [WIP] Topics

---
 submodules/Postbox/Sources/MessageHistoryTagsSummaryTable.swift | 2 +-
 submodules/Postbox/Sources/MessageHistoryView.swift             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/submodules/Postbox/Sources/MessageHistoryTagsSummaryTable.swift b/submodules/Postbox/Sources/MessageHistoryTagsSummaryTable.swift
index e2fecf2f4e..278fb01d11 100644
--- a/submodules/Postbox/Sources/MessageHistoryTagsSummaryTable.swift
+++ b/submodules/Postbox/Sources/MessageHistoryTagsSummaryTable.swift
@@ -96,7 +96,7 @@ class MessageHistoryTagsSummaryTable: Table {
             self.sharedThreadKey.setInt64(4, value: key.peerId.toInt64())
             self.sharedThreadKey.setInt32(4 + 8, value: key.namespace)
             self.sharedThreadKey.setInt64(4 + 8 + 4, value: threadId)
-            return self.sharedSimpleKey
+            return self.sharedThreadKey
         } else {
             self.sharedSimpleKey.setUInt32(0, value: key.tag.rawValue)
             self.sharedSimpleKey.setInt64(4, value: key.peerId.toInt64())
diff --git a/submodules/Postbox/Sources/MessageHistoryView.swift b/submodules/Postbox/Sources/MessageHistoryView.swift
index db88d90a3c..1cc4014f82 100644
--- a/submodules/Postbox/Sources/MessageHistoryView.swift
+++ b/submodules/Postbox/Sources/MessageHistoryView.swift
@@ -582,7 +582,7 @@ final class MutableMessageHistoryView {
                         
                         var matches = false
                         if matchesTag {
-                            if !isExternal || message.threadId == externalThreadId {
+                            if (!isExternal && externalThreadId == nil) || message.threadId == externalThreadId {
                                 if self.namespaces.contains(message.id.namespace) {
                                     matches = true
                                     if loadedState.add(entry: .IntermediateMessageEntry(message, nil, nil)) {