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

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2024-03-25 23:18:46 +04:00
parent 54a90be1f4
commit f10bbfcc72
1 changed files with 69 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
submodules/ContactListUI/Sources/ContactListNode.swift
View File

@ -577,7 +577,17 @@ private func contactListNodeEntries(accountPeer: EnginePeer?, peers: [ContactLis
actionTitle = allSelected ? strings.Premium_Gift_ContactSelection_DeselectAll.uppercased() : strings.Premium_Gift_ContactSelection_SelectAll.uppercased() actionTitle = allSelected ? strings.Premium_Gift_ContactSelection_DeselectAll.uppercased() : strings.Premium_Gift_ContactSelection_SelectAll.uppercased()
} }
let header: ListViewItemHeader? = ChatListSearchItemHeader(type: .text(title.uppercased(), AnyHashable(10 * sectionId + (allSelected ? 1 : 0))), theme: theme, strings: strings, actionTitle: actionTitle, action: { let header: ListViewItemHeader? = ChatListSearchItemHeader(type: .text(title.uppercased(), AnyHashable(10 * sectionId + (allSelected ? 1 : 0))), theme: theme, strings: strings, actionTitle: actionTitle, action: {
interaction.toggleSelection(topPeers.filter { peerIds.contains($0.id) }, !allSelected) var existingPeerIds = Set<EnginePeer.Id>()
var peers: [EnginePeer] = []
for peer in topPeers {
if !existingPeerIds.contains(peer.id) {
if peerIds.contains(peer.id) {
peers.append(peer)
existingPeerIds.insert(peer.id)
}
}
}
interaction.toggleSelection(peers, !allSelected)
}) })
for peerId in peerIds { for peerId in peerIds {
@ -1616,16 +1626,35 @@ public final class ContactListNode: ASDisplayNode {
chatListSignal = .single([]) chatListSignal = .single([])
} }
let topPeers: Signal<[EnginePeer], NoError> struct TopPeer {
let peer: EnginePeer
let presence: EnginePeer.Presence?
}
let topPeers: Signal<[TopPeer], NoError>
switch displayTopPeers { switch displayTopPeers {
case .recent: case .recent:
topPeers = context.engine.peers.recentPeers() topPeers = context.engine.peers.recentPeers()
|> map { recentPeers -> [EnginePeer] in |> mapToSignal { recentPeers -> Signal<[TopPeer], NoError> in
var topPeers: [EnginePeer] = []
if case let .peers(peers) = recentPeers { if case let .peers(peers) = recentPeers {
topPeers = peers.map(EnginePeer.init) let topPeers = peers.map(EnginePeer.init)
return context.engine.data.subscribe(
EngineDataMap(peers.map(\.id).map(TelegramEngine.EngineData.Item.Peer.Presence.init))
)
|> map { presences -> [TopPeer] in
var result: [TopPeer] = []
for peer in topPeers {
var presence: EnginePeer.Presence?
if let maybePresence = presences[peer.id], let presenceValue = maybePresence {
presence = presenceValue
}
result.append(TopPeer(peer: peer, presence: presence))
}
return result
}
} else {
return .single([])
} }
return topPeers
} }
case let .custom(sections): case let .custom(sections):
var peerIds: [EnginePeer.Id] = [] var peerIds: [EnginePeer.Id] = []
@ -1635,16 +1664,35 @@ public final class ContactListNode: ASDisplayNode {
topPeers = combineLatest( topPeers = combineLatest(
context.engine.data.get(EngineDataMap(peerIds.map(TelegramEngine.EngineData.Item.Peer.Peer.init(id:)))), context.engine.data.get(EngineDataMap(peerIds.map(TelegramEngine.EngineData.Item.Peer.Peer.init(id:)))),
context.engine.peers.recentPeers() context.engine.peers.recentPeers()
) |> map { peers, recentPeers in |> mapToSignal { recentPeers -> Signal<[TopPeer], NoError> in
var result: [EnginePeer] = [] if case let .peers(peers) = recentPeers {
for peer in peers.values { let topPeers = peers.map(EnginePeer.init)
if let peer { return context.engine.data.subscribe(
result.append(peer) EngineDataMap(peers.map(\.id).map(TelegramEngine.EngineData.Item.Peer.Presence.init))
)
|> map { presences -> [TopPeer] in
var result: [TopPeer] = []
for peer in topPeers {
var presence: EnginePeer.Presence?
if let maybePresence = presences[peer.id], let presenceValue = maybePresence {
presence = presenceValue
}
result.append(TopPeer(peer: peer, presence: presence))
}
return result
}
} else {
return .single([])
} }
} }
if case let .peers(peers) = recentPeers { ) |> map { peers, recentPeers in
result.append(contentsOf: peers.map(EnginePeer.init)) var result: [TopPeer] = []
for peer in peers.values {
if let peer {
result.append(TopPeer(peer: peer, presence: nil))
}
} }
result.append(contentsOf: recentPeers)
return result return result
} }
case .none: case .none:
@ -1703,11 +1751,18 @@ public final class ContactListNode: ASDisplayNode {
} }
} }
var presences = view.0.presences
for peer in topPeers {
if let presence = peer.presence {
presences[peer.peer.id] = presence
}
}
var isEmpty = false var isEmpty = false
if (authorizationStatus == .notDetermined || authorizationStatus == .denied) && peers.isEmpty { if (authorizationStatus == .notDetermined || authorizationStatus == .denied) && peers.isEmpty {
isEmpty = true isEmpty = true
} }
let entries = contactListNodeEntries(accountPeer: view.1, peers: peers, presences: view.0.presences, presentation: presentation, selectionState: selectionState, theme: presentationData.theme, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, sortOrder: presentationData.nameSortOrder, displayOrder: presentationData.nameDisplayOrder, disabledPeerIds: disabledPeerIds, peerRequiresPremiumForMessaging: view.2, authorizationStatus: authorizationStatus, warningSuppressed: warningSuppressed, displaySortOptions: displaySortOptions, displayCallIcons: displayCallIcons, storySubscriptions: storySubscriptions, topPeers: topPeers, topPeersPresentation: displayTopPeers, interaction: interaction) let entries = contactListNodeEntries(accountPeer: view.1, peers: peers, presences: presences, presentation: presentation, selectionState: selectionState, theme: presentationData.theme, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, sortOrder: presentationData.nameSortOrder, displayOrder: presentationData.nameDisplayOrder, disabledPeerIds: disabledPeerIds, peerRequiresPremiumForMessaging: view.2, authorizationStatus: authorizationStatus, warningSuppressed: warningSuppressed, displaySortOptions: displaySortOptions, displayCallIcons: displayCallIcons, storySubscriptions: storySubscriptions, topPeers: topPeers.map { $0.peer }, topPeersPresentation: displayTopPeers, interaction: interaction)
let previous = previousEntries.swap(entries) let previous = previousEntries.swap(entries)
let previousSelection = previousSelectionState.swap(selectionState) let previousSelection = previousSelectionState.swap(selectionState)
let previousPendingRemovalPeerIds = previousPendingRemovalPeerIds.swap(pendingRemovalPeerIds) let previousPendingRemovalPeerIds = previousPendingRemovalPeerIds.swap(pendingRemovalPeerIds)