mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-16 05:55:20 +00:00
Merge commit 'df901940dbc7746742c8da6a264a8d122be10744'
This commit is contained in:
commit
18f294ab3b
@ -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 {
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user