Keep the title and zero message count when a saved chat becomes empty (#133)

* fix(ChatUI): preserve empty Saved Messages chat title and keep chat open

* fix(ChatUI): distinguish saved chat loading and deletion

* fix(ChatUI): use consistent saved-message count labels

* fix(ChatUI): close explicitly deleted saved chats across account windows

Author: CHUKEPC

���packages/ChatUI/Sources/ChatUI/ChatController.swift

@@ -3912,13 +3912,8 @@ open class ChatController<Context: AccountContextProtocol>: TelegramGenericViewC
                         let countViewKey: PostboxViewKey = .historyTagSummaryView(tag: MessageTags(), peerId: peerId, threadId: savedMessagesPeerId.toInt64(), namespace: Namespaces.Message.Cloud, customTag: nil)
                         answersCount = context.account.postbox.combinedView(keys: [basicPeerKey, countViewKey])
                         |> map { views -> Int32? in
-                            
-                            var messageCount = 0
-                            if let summaryView = views.views[countViewKey] as? MessageHistoryTagSummaryView, let count = summaryView.count {
-                                messageCount += Int(count)
-                            }
-                            
-                            return Int32(messageCount)
+                            let count = (views.views[countViewKey] as? MessageHistoryTagSummaryView)?.count
+                            return mode.isSavedMessagesThread ? count : count ?? 0
                         }
 
                     } else if isThread {
@@ -11367,6 +11362,9 @@ open class ChatController<Context: AccountContextProtocol>: TelegramGenericViewC
             return takeTableItem?(msgId)
         })
         super.init(context)
+        if mode.isSavedMessagesThread {
+            SavedChatControllerRegistry.shared.add(self)
+        }
 
         self.bar = .init(height: 0)
         self.insets = NSEdgeInsets()
@@ -11802,7 +11800,7 @@ open class ChatController<Context: AccountContextProtocol>: TelegramGenericViewC
             }
 
             if let peer = value.mainPeer, let oldPeer = oldValue.mainPeer {
-                if TelegramUtilsHooks.shared.peerIsForum(peer) && !TelegramUtilsHooks.shared.peerIsForum(oldPeer) || (oldValue.threadInfo != nil && value.threadInfo == nil && !peer.displayForumAsTabs(splitState: context.layout)), !peer.isMonoForum {
+                if TelegramUtilsHooks.shared.peerIsForum(peer) && !TelegramUtilsHooks.shared.peerIsForum(oldPeer) || (!self.mode.isSavedMessagesThread && oldValue.threadInfo != nil && value.threadInfo == nil && !peer.displayForumAsTabs(splitState: context.layout)), !peer.isMonoForum {
                     if (self.navigationController?.stackCount ?? 0) > 1 {
                         self.navigationController?.removeImmediately(self)
                     } else if self.mode == .preview {

packages/ChatUI/Sources/ChatUI/ChatHeaderBubblesView.swift

@@ -903,10 +903,9 @@ final class ChatHeaderBubblesView: View, InteractionContentViewProtocol {
                     result = result.withUpdatedTitle(presentation.threadInfo?.info.title ?? "").withUpdatedStatus(strings().peerInfoTopicStatusIn(peer.displayTitle))
                 }
             case .savedMessages:
-                if let count = counters.replies, count > 0 {
-                    result = result.withUpdatedTitle(peer.displayTitle).withUpdatedStatus(strings().chatTitleTopicOther(Int(count)))
-                } else {
-                    result = result.withUpdatedTitle(presentation.threadInfo?.info.title ?? "").withUpdatedStatus(strings().peerInfoTopicStatusIn(peer.displayTitle))
+                result = result.withUpdatedTitle(peer.displayTitle).withUpdatedStatus("")
+                if let count = counters.replies {
+                    result = result.withUpdatedStatus(strings().sharedMediaSavedCountOther(Int(count)))
                 }
                 if PeerId(data.threadId) == chatInteraction.interactionContext.peerId {
                     result = result.withUpdatedTitle(strings().peerMyNotes)

packages/ChatUI/Sources/ChatUI/LeaveChatActions.swift

@@ -377,14 +377,19 @@ private func showStandardLeaveDialog(context: any AccountContextProtocol, peer:
 
             let verify = verifyAlertSignal(for: context.window, information: text, ok: okTitle ?? strings().alertOK, option: thridTitle, optionIsSelected: false, completeWhenDismissed: true) |> filter { $0 != nil }
 
-            return combineLatest(verify, context.globalPeerHandler.get() |> take(1)) |> map { result, location -> Bool in
+            return combineLatest(verify, context.globalPeerHandler.get() |> take(1)) |> deliverOnMainQueue |> map { result, location -> Bool in
 
                 if let threadId = threadId {
                     _ = context.engine.peers.removeForumChannelThread(id: peerId, threadId: threadId).start()
                 } else {
                     scheduleChatRemoval(context: context, peer: peer, peerId: peerId, deleteGloballyIfPossible: result == .thrid || forceRemoveGlobally, blockBot: peer.isBot && result == .thrid)
                 }
 
+                if let threadId = threadId, peerId == context.peerId {
+                    SavedChatControllerRegistry.shared.remove(accountId: context.account.id, peerId: peerId, threadId: threadId)
+                    return true
+                }
+
                 switch location {
                 case let .peer(id):
                     if id == peerId {

packages/ChatUI/Sources/ChatUI/SavedChatControllerRegistry.swift

@@ -0,0 +1,33 @@
+import Cocoa
+import Postbox
+import TelegramCore
+import TelegramContext
+import TGUIKit
+
+final class SavedChatControllerRegistry {
+    static let shared = SavedChatControllerRegistry()
+    private let controllers = NSHashTable<ViewController>.weakObjects()
+
+    func add(_ controller: ViewController) {
+        controllers.add(controller)
+    }
+
+    func remove(accountId: AccountRecordId, peerId: PeerId, threadId: Int64) {
+        let matches = controllers.allObjects.filter { controller in
+            guard let controller = controller as? ChatControllerKind else { return false }
+            let interaction = controller.chatInteraction
+            return interaction.interactionContext.account.id == accountId
+                && interaction.mode.isSavedMessagesThread
+                && interaction.chatLocation.peerId == peerId
+                && interaction.chatLocation.threadId == threadId
+        }
+        for controller in matches {
+            guard let navigation = controller.navigationController else { continue }
+            if navigation.empty === controller {
+                navigation.window?.performClose(nil)
+            } else {
+                navigation.removeImmediately(controller)
+            }
+        }
+    }
+}