ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-07-25 20:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed recent search for Heart emoji

Browse Source
This commit is contained in:
Ilya Laktyushin 2019-06-20 19:08:10 +02:00
parent 43dcb635d5
commit f77f2f0dbf
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextQueries.swift
View File

@ -83,7 +83,7 @@ private func updatedContextQueryResultStateForQuery(context: AccountContext, pee
case .installed: case .installed:
scope = [.installed] scope = [.installed]
} }
return searchStickers(account: context.account, query: query, scope: scope) return searchStickers(account: context.account, query: query.trimmedEmoji, scope: scope)
} }
|> map { stickers -> (ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult? in |> map { stickers -> (ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult? in
return { _ in return { _ in

8
submodules/TelegramUI/TelegramUI/EmojiUtils.swift
View File

@ -135,4 +135,12 @@ extension String {
} }
return string return string
} }
var trimmedEmoji: String {
if self.unicodeScalars.count > 1, self.unicodeScalars.first?.value == 0x2764 {
return String(self.unicodeScalars.prefix(self.unicodeScalars.count - 1))
} else {
return self
}
}
} }

4
submodules/TelegramUI/TelegramUI/StickerPaneSearchContentNode.swift
View File

@ -267,7 +267,7 @@ final class StickerPaneSearchContentNode: ASDisplayNode, PaneSearchContentNode {
let query = text.trimmingCharacters(in: .whitespacesAndNewlines) let query = text.trimmingCharacters(in: .whitespacesAndNewlines)
if query.isSingleEmoji { if query.isSingleEmoji {
signals = .single([searchStickers(account: account, query: text) signals = .single([searchStickers(account: account, query: text.trimmedEmoji)
|> take(1) |> take(1)
|> map { (nil, $0) }]) |> map { (nil, $0) }])
} else if query.count > 1, let languageCode = languageCode, !languageCode.isEmpty && languageCode != "emoji" { } else if query.count > 1, let languageCode = languageCode, !languageCode.isEmpty && languageCode != "emoji" {
@ -290,7 +290,7 @@ final class StickerPaneSearchContentNode: ASDisplayNode, PaneSearchContentNode {
var signals: [Signal<(String?, [FoundStickerItem]), NoError>] = [] var signals: [Signal<(String?, [FoundStickerItem]), NoError>] = []
let emoticons = keywords.flatMap { $0.emoticons } let emoticons = keywords.flatMap { $0.emoticons }
for emoji in emoticons { for emoji in emoticons {
signals.append(searchStickers(account: self.context.account, query: emoji) signals.append(searchStickers(account: self.context.account, query: emoji.trimmedEmoji)
|> take(1) |> take(1)
|> map { (emoji, $0) }) |> map { (emoji, $0) })
} }