Various Fixes

This commit is contained in:
Ilya Laktyushin
2022-01-14 01:56:41 +03:00
parent 1c9126971a
commit b102311660
6 changed files with 164 additions and 82 deletions

View File

@@ -1111,7 +1111,7 @@ func contextMenuForChatPresentationInterfaceState(chatPresentationInterfaceState
}
if data.messageActions.options.contains(.forward) {
if chatPresentationInterfaceState.copyProtectionEnabled {
if chatPresentationInterfaceState.copyProtectionEnabled || message.isCopyProtected() {
} else {
actions.append(.action(ContextMenuActionItem(text: chatPresentationInterfaceState.strings.Conversation_ContextMenuForward, icon: { theme in
@@ -1508,7 +1508,7 @@ func chatAvailableMessageActionsImpl(postbox: Postbox, accountPeerId: PeerId, me
}
}
} else if let user = peer as? TelegramUser {
if !isScheduled && message.id.peerId.namespace != Namespaces.Peer.SecretChat && !message.containsSecretMedia && !isAction && !message.id.peerId.isReplies {
if !isScheduled && message.id.peerId.namespace != Namespaces.Peer.SecretChat && !message.containsSecretMedia && !isAction && !message.id.peerId.isReplies && !message.isCopyProtected() {
if !(message.flags.isSending || message.flags.contains(.Failed)) {
optionsMap[id]!.insert(.forward)
}