ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-06 22:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix random greeting sticker fetch

Browse Source
This commit is contained in:
Ilya Laktyushin 2021-05-01 03:30:16 +04:00
parent fc8fd36229
commit bfcbf98931
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
submodules/TelegramCore/Sources/TelegramEngine/Stickers/SearchStickers.swift
View File

@ -59,14 +59,24 @@ public struct SearchStickersScope: OptionSet {
} }
func _internal_randomGreetingSticker(account: Account) -> Signal<FoundStickerItem?, NoError> { func _internal_randomGreetingSticker(account: Account) -> Signal<FoundStickerItem?, NoError> {
return account.postbox.transaction { transaction -> FoundStickerItem? in let key: PostboxViewKey = .orderedItemList(id: Namespaces.OrderedItemList.CloudGreetingStickers)
var stickerItems: [FoundStickerItem] = [] return account.postbox.combinedView(keys: [key])
for entry in transaction.getOrderedListItems(collectionId: Namespaces.OrderedItemList.CloudGreetingStickers) { |> map { views -> [OrderedItemListEntry]? in
if let item = entry.contents as? RecentMediaItem, let file = item.media as? TelegramMediaFile { if let view = views.views[key] as? OrderedItemListView, !view.items.isEmpty {
stickerItems.append(FoundStickerItem(file: file, stringRepresentations: [])) return view.items
} } else {
return nil
} }
return stickerItems.randomElement() }
|> filter { items in
return items != nil
}
|> take(1)
|> map { items -> FoundStickerItem? in
if let randomItem = items?.randomElement(), let item = randomItem.contents as? RecentMediaItem, let file = item.media as? TelegramMediaFile {
return FoundStickerItem(file: file, stringRepresentations: [])
}
return nil
} }
} }

7
submodules/TelegramUI/Sources/ChatEmptyNode.swift
View File

@ -853,6 +853,7 @@ final class ChatEmptyNode: ASDisplayNode {
contentType = .regular contentType = .regular
} }
var updateGreetingSticker = false
var contentTransition = transition var contentTransition = transition
if self.content?.0 != contentType { if self.content?.0 != contentType {
var animateContentIn = false var animateContentIn = false
@ -876,7 +877,7 @@ final class ChatEmptyNode: ASDisplayNode {
node = ChatEmptyNodeNearbyChatContent(context: self.context, interaction: self.interaction) node = ChatEmptyNodeNearbyChatContent(context: self.context, interaction: self.interaction)
case .greeting: case .greeting:
node = ChatEmptyNodeGreetingChatContent(context: self.context, interaction: self.interaction) node = ChatEmptyNodeGreetingChatContent(context: self.context, interaction: self.interaction)
self.context.prefetchManager?.prepareNextGreetingSticker() updateGreetingSticker = true
} }
self.content = (contentType, node) self.content = (contentType, node)
self.addSubnode(node) self.addSubnode(node)
@ -894,6 +895,10 @@ final class ChatEmptyNode: ASDisplayNode {
var contentSize = CGSize() var contentSize = CGSize()
if let contentNode = self.content?.1 { if let contentNode = self.content?.1 {
contentSize = contentNode.updateLayout(interfaceState: interfaceState, size: displayRect.size, transition: contentTransition) contentSize = contentNode.updateLayout(interfaceState: interfaceState, size: displayRect.size, transition: contentTransition)
if updateGreetingSticker {
self.context.prefetchManager?.prepareNextGreetingSticker()
}
} }
let contentFrame = CGRect(origin: CGPoint(x: displayRect.minX + floor((displayRect.width - contentSize.width) / 2.0), y: displayRect.minY + floor((displayRect.height - contentSize.height) / 2.0)), size: contentSize) let contentFrame = CGRect(origin: CGPoint(x: displayRect.minX + floor((displayRect.width - contentSize.width) / 2.0), y: displayRect.minY + floor((displayRect.height - contentSize.height) / 2.0)), size: contentSize)