ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update filter counters

Browse Source
This commit is contained in:
Ali 2020-06-02 20:31:16 +04:00
parent d01053229d
commit e41c5fe8bf
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
submodules/ChatListUI/Sources/TabBarChatListFilterController.swift
View File

@ -101,14 +101,14 @@ func chatListFilterItems(postbox: Postbox) -> Signal<(Int, [(ChatListFilter, Int
} }
var count = 0 var count = 0
var hasUnmutedUnread = false var unmutedUnreadCount = 0
if let totalState = totalStates[.root] { if let totalState = totalStates[.root] {
for tag in tags { for tag in tags {
if filter.data.excludeMuted { if filter.data.excludeMuted {
if let value = totalState.filteredCounters[tag] { if let value = totalState.filteredCounters[tag] {
if value.chatCount != 0 { if value.chatCount != 0 {
count += Int(value.chatCount) count += Int(value.chatCount)
hasUnmutedUnread = true unmutedUnreadCount += Int(value.chatCount)
} }
} }
} else { } else {
@ -117,7 +117,7 @@ func chatListFilterItems(postbox: Postbox) -> Signal<(Int, [(ChatListFilter, Int
} }
if let value = totalState.filteredCounters[tag] { if let value = totalState.filteredCounters[tag] {
if value.chatCount != 0 { if value.chatCount != 0 {
hasUnmutedUnread = true unmutedUnreadCount += Int(value.chatCount)
} }
} }
} }
@ -130,7 +130,7 @@ func chatListFilterItems(postbox: Postbox) -> Signal<(Int, [(ChatListFilter, Int
if let value = totalState.filteredCounters[tag] { if let value = totalState.filteredCounters[tag] {
if value.chatCount != 0 { if value.chatCount != 0 {
count += Int(value.chatCount) count += Int(value.chatCount)
hasUnmutedUnread = true unmutedUnreadCount += Int(value.chatCount)
} }
} }
} else { } else {
@ -139,7 +139,7 @@ func chatListFilterItems(postbox: Postbox) -> Signal<(Int, [(ChatListFilter, Int
} }
if let value = totalState.filteredCounters[tag] { if let value = totalState.filteredCounters[tag] {
if value.chatCount != 0 { if value.chatCount != 0 {
hasUnmutedUnread = true unmutedUnreadCount += Int(value.chatCount)
} }
} }
} }
@ -170,7 +170,7 @@ func chatListFilterItems(postbox: Postbox) -> Signal<(Int, [(ChatListFilter, Int
if matchesGroup && peerCount != 0 { if matchesGroup && peerCount != 0 {
count += 1 count += 1
if hasUnmuted { if hasUnmuted {
hasUnmutedUnread = true unmutedUnreadCount += 1
} }
} }
} }
@ -181,7 +181,6 @@ func chatListFilterItems(postbox: Postbox) -> Signal<(Int, [(ChatListFilter, Int
var matches = true var matches = true
if tags.contains(tag) { if tags.contains(tag) {
if isMuted && filter.data.excludeMuted { if isMuted && filter.data.excludeMuted {
} else {
matches = false matches = false
} }
} }
@ -200,11 +199,14 @@ func chatListFilterItems(postbox: Postbox) -> Signal<(Int, [(ChatListFilter, Int
} }
if matchesGroup && peerCount != 0 { if matchesGroup && peerCount != 0 {
count -= 1 count -= 1
if !isMuted {
unmutedUnreadCount -= 1
} }
} }
} }
} }
result.append((filter, max(0, count), hasUnmutedUnread)) }
result.append((filter, max(0, count), unmutedUnreadCount > 0))
} }
return (totalBadge, result) return (totalBadge, result)