From 5d6a5ee3f970e64d53af049dfe57c46f1f4f56ef Mon Sep 17 00:00:00 2001
From: Peter <>
Date: Tue, 27 Nov 2018 19:35:33 +0300
Subject: [PATCH] Fixed mark empty chat as read

---
 TelegramCore/ApplyMaxReadIndexInteractively.swift | 2 ++
 TelegramCore/RecentlySearchedPeerIds.swift        | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/TelegramCore/ApplyMaxReadIndexInteractively.swift b/TelegramCore/ApplyMaxReadIndexInteractively.swift
index 487c22229c..d810b6a7bc 100644
--- a/TelegramCore/ApplyMaxReadIndexInteractively.swift
+++ b/TelegramCore/ApplyMaxReadIndexInteractively.swift
@@ -134,6 +134,8 @@ public func togglePeerUnreadMarkInteractively(transaction: Transaction, viewTrac
                     if setToValue == nil || !(setToValue!) {
                         if let index = transaction.getTopPeerMessageIndex(peerId: peerId, namespace: namespace) {
                             let _ = transaction.applyInteractiveReadMaxIndex(index)
+                        } else {
+                            transaction.applyMarkUnread(peerId: peerId, namespace: namespace, value: false, interactive: true)
                         }
                         viewTracker.updateMarkAllMentionsSeen(peerId: peerId)
                     }
diff --git a/TelegramCore/RecentlySearchedPeerIds.swift b/TelegramCore/RecentlySearchedPeerIds.swift
index 7ff03f179b..8161f39563 100644
--- a/TelegramCore/RecentlySearchedPeerIds.swift
+++ b/TelegramCore/RecentlySearchedPeerIds.swift
@@ -58,8 +58,8 @@ public func recentlySearchedPeers(postbox: Postbox) -> Signal<[RecentlySearchedP
             var unreadCounts: [PeerId: Int32] = [:]
             if let unreadCountsView = view.views[unreadCountsKey] as? UnreadMessageCountsView {
                 for entry in unreadCountsView.entries {
-                    if case let .peer(peerId, count) = entry {
-                        unreadCounts[peerId] = count
+                    if case let .peer(peerId, state) = entry {
+                        unreadCounts[peerId] = state?.count ?? 0
                     }
                 }
             }