From 455a3f89d5e735ba67ec9f7a240519d4eb78fad7 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Thu, 4 Aug 2022 03:36:20 +0300 Subject: [PATCH 1/2] Emoji fixes --- .../TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift index 02fae6f7bd..0146195542 100644 --- a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift @@ -554,7 +554,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { emojiFile = item.associatedData.animatedEmojiStickers[emoji.strippedEmoji]?.first?.file } - if item.message.text.count == 1 && emojiFile != nil { + if item.message.text.count == 1, item.message.associatedMedia.isEmpty && emojiFile != nil { emojiString = nil } else if emojiString != nil { emojiFile = nil From df901940dbc7746742c8da6a264a8d122be10744 Mon Sep 17 00:00:00 2001 From: Mike Renoir <> Date: Fri, 5 Aug 2022 19:03:28 +0200 Subject: [PATCH 2/2] api fix --- .../Sources/TelegramEngine/Peers/CopyProtection.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Peers/CopyProtection.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/CopyProtection.swift index 3babf404db..79ea9a9db8 100644 --- a/submodules/TelegramCore/Sources/TelegramEngine/Peers/CopyProtection.swift +++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/CopyProtection.swift @@ -7,7 +7,7 @@ import MtProtoKit func _internal_toggleMessageCopyProtection(account: Account, peerId: PeerId, enabled: Bool) -> Signal { return account.postbox.transaction { transaction -> Signal in if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer) { - return account.network.request(Api.functions.messages.toggleNoForwards(peer: inputPeer, enabled: enabled ? .boolTrue : .boolFalse)) |> retryRequest |> map { updates -> Void in + return account.network.request(Api.functions.messages.toggleNoForwards(peer: inputPeer, enabled: enabled ? .boolTrue : .boolFalse)) |> `catch` { _ in .complete() } |> map { updates -> Void in account.stateManager.addUpdates(updates) } } else {