Merge commit 'b83248d844d7d3fc178843f1f9cdc607004a5c68'

This commit is contained in:
Peter
2018-09-07 01:07:52 +03:00
25 changed files with 363 additions and 82 deletions

View File

@@ -307,6 +307,26 @@ public final class ChatController: TelegramController, UIViewControllerPreviewin
controllerInteraction.hiddenMedia = messageIdAndMedia
strongSelf.chatDisplayNode.historyNode.forEachItemNode { itemNode in
if let itemNode = itemNode as? ChatMessageItemView {
itemNode.updateHiddenMedia()
}
}
}
}))
}
}, chatAvatarHiddenMedia: { signal, media in
if let strongSelf = self {
strongSelf.temporaryHiddenGalleryMediaDisposable.set((signal |> deliverOnMainQueue).start(next: { messageId in
if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction {
var messageIdAndMedia: [MessageId: [Media]] = [:]
if let messageId = messageId {
messageIdAndMedia[messageId] = [media]
}
controllerInteraction.hiddenMedia = messageIdAndMedia
strongSelf.chatDisplayNode.historyNode.forEachItemNode { itemNode in
if let itemNode = itemNode as? ChatMessageItemView {
itemNode.updateHiddenMedia()
@@ -3828,7 +3848,7 @@ public final class ChatController: TelegramController, UIViewControllerPreviewin
searchDisposable = MetaDisposable()
self.searchDisposable = searchDisposable
}
searchDisposable.set((searchMessages(account: self.account, location: location, query: query)
searchDisposable.set((searchMessages(account: self.account, location: location, query: query) |> map {$0.0}
|> delay(0.2, queue: Queue.mainQueue())
|> deliverOnMainQueue).start(next: { [weak self] results in
if let strongSelf = self {