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

Merge branch 'master' of https://gitlab.com/peter-iakovlev/telegramcore

Browse Source 
# Conflicts:
#	TelegramCore/EmojiKeywords.swift
This commit is contained in:
overtake 2019-03-19 22:19:53 +04:00
commit 413ac9a3c1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TelegramCore/EmojiKeywords.swift
View File

@ -258,7 +258,7 @@ private func downloadEmojiKeywordsDifference(network: Network, languageCode: Str
public func emojiKeywords(accountManager: AccountManager, network: Network, inputLanguageCode: String) -> Signal<EmojiKeywords?, NoError> {
return accountManager.sharedData(keys: [SharedDataKeys.emojiKeywords])
|> take(1)
// |> take(1)
|> map { sharedData in
return sharedData.entries[SharedDataKeys.emojiKeywords] as? EmojiKeywordsMap ?? .defaultValue
}
@ -285,7 +285,7 @@ public func emojiKeywords(accountManager: AccountManager, network: Network, inpu
if emojiKeywords.timestamp + refreshTimeout > timestamp {
return .single(emojiKeywords)
} else {
return downloadEmojiKeywordsDifference(network: network, languageCode: emojiKeywords.languageCode, inputLanguageCode: inputLanguageCode, fromVersion: emojiKeywords.version)
return .single(emojiKeywords) |> then(downloadEmojiKeywordsDifference(network: network, languageCode: emojiKeywords.languageCode, inputLanguageCode: inputLanguageCode, fromVersion: emojiKeywords.version)
|> map(Optional.init)
|> `catch` { _ -> Signal<EmojiKeywords?, NoError> in
return .single(nil)
@ -313,7 +313,7 @@ public func emojiKeywords(accountManager: AccountManager, network: Network, inpu
} else {
return downloadEmojiKeywordsSignal
}
}
})
}
} else {
return downloadEmojiKeywordsSignal