Merge commit '72a31f187c7b6711c5547039fb124dc56b5e5d1e'

# Conflicts:
#	submodules/DebugSettingsUI/Sources/DebugController.swift
#	submodules/TelegramCore/Sources/ApiUtils/ReactionsMessageAttribute.swift
#	submodules/TelegramCore/Sources/Network/Network.swift
#	submodules/TelegramCore/Sources/State/MessageReactions.swift
This commit is contained in:
Ali
2023-03-07 16:04:46 +04:00
66 changed files with 1843 additions and 614 deletions

View File

@@ -177,7 +177,7 @@ final class StickerPaneSearchContentNode: ASDisplayNode, PaneSearchContentNode {
self.strings = strings
self.trendingPane = ChatMediaInputTrendingPane(context: context, controllerInteraction: controllerInteraction, getItemIsPreviewed: { [weak inputNodeInteraction] item in
return inputNodeInteraction?.previewedStickerPackItem == .pack(item.file)
return inputNodeInteraction?.previewedStickerPackItemFile?.id == item.file.id
}, isPane: false)
self.gridNode = GridNode()
@@ -315,7 +315,7 @@ final class StickerPaneSearchContentNode: ASDisplayNode, PaneSearchContentNode {
let _ = strongSelf.controllerInteraction.sendSticker(file, false, false, nil, false, sourceView, sourceRect, nil, [])
}
}, getItemIsPreviewed: { item in
return inputNodeInteraction.previewedStickerPackItem == .pack(item.file)
return inputNodeInteraction.previewedStickerPackItemFile?.id == item.file.id
})
self._ready.set(self.trendingPane.ready)