github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-06 03:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'df901940db'

Browse source
This commit is contained in:
Ali 2022-08-05 23:16:34 +04:00
commit 18f294ab3b
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
submodules/TelegramCore/Sources/TelegramEngine/Peers/CopyProtection.swift
View file

@ -7,7 +7,7 @@ import MtProtoKit
func _internal_toggleMessageCopyProtection(account: Account, peerId: PeerId, enabled: Bool) -> Signal<Void, NoError> {
return account.postbox.transaction { transaction -> Signal<Void, NoError> 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 {

2
submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
View file

@ -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