mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-16 05:55:20 +00:00
Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios
This commit is contained in:
commit
6169910992
@ -1019,7 +1019,6 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
|
|||||||
|
|
||||||
let previousRecentlySearchedPeerOrder = Atomic<[EnginePeer.Id]>(value: [])
|
let previousRecentlySearchedPeerOrder = Atomic<[EnginePeer.Id]>(value: [])
|
||||||
let fixedRecentlySearchedPeers = context.engine.peers.recentlySearchedPeers()
|
let fixedRecentlySearchedPeers = context.engine.peers.recentlySearchedPeers()
|
||||||
|> take(1)
|
|
||||||
|> map { peers -> [RecentlySearchedPeer] in
|
|> map { peers -> [RecentlySearchedPeer] in
|
||||||
var result: [RecentlySearchedPeer] = []
|
var result: [RecentlySearchedPeer] = []
|
||||||
let _ = previousRecentlySearchedPeerOrder.modify { current in
|
let _ = previousRecentlySearchedPeerOrder.modify { current in
|
||||||
@ -1188,7 +1187,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
|
|||||||
if let query = query {
|
if let query = query {
|
||||||
foundLocalPeers = combineLatest(
|
foundLocalPeers = combineLatest(
|
||||||
context.engine.contacts.searchLocalPeers(query: query.lowercased()),
|
context.engine.contacts.searchLocalPeers(query: query.lowercased()),
|
||||||
context.engine.peers.recentlySearchedPeers()
|
context.engine.peers.recentlySearchedPeers() |> take(1)
|
||||||
)
|
)
|
||||||
|> mapToSignal { local, allRecentlySearched -> Signal<([EnginePeer.Id: Optional<EnginePeer.NotificationSettings>], [EnginePeer.Id: Int], [EngineRenderedPeer], Set<EnginePeer.Id>), NoError> in
|
|> mapToSignal { local, allRecentlySearched -> Signal<([EnginePeer.Id: Optional<EnginePeer.NotificationSettings>], [EnginePeer.Id: Int], [EngineRenderedPeer], Set<EnginePeer.Id>), NoError> in
|
||||||
let recentlySearched = allRecentlySearched.filter { peer in
|
let recentlySearched = allRecentlySearched.filter { peer in
|
||||||
|
Loading…
x
Reference in New Issue
Block a user