From 0f38ee99305debcffc2da67e7d98832a8ffa4d7c Mon Sep 17 00:00:00 2001 From: Ali <> Date: Mon, 4 Jul 2022 13:51:41 +0200 Subject: [PATCH] Treat Namespaces.Message.ScheduledLocal as Namespaces.Message.Local --- .../TelegramEngine/Messages/DeleteMessagesInteractively.swift | 2 +- .../Sources/ChatMessageAnimatedStickerItemNode.swift | 4 ++-- .../TelegramUI/Sources/ChatMessageInstantVideoItemNode.swift | 2 +- .../Sources/ChatMessageInteractiveInstantVideoNode.swift | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Messages/DeleteMessagesInteractively.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/DeleteMessagesInteractively.swift index 3531dc0ba5..29d426d335 100644 --- a/submodules/TelegramCore/Sources/TelegramEngine/Messages/DeleteMessagesInteractively.swift +++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/DeleteMessagesInteractively.swift @@ -53,7 +53,7 @@ func deleteMessagesInteractively(transaction: Transaction, stateManager: Account if peerId.namespace == Namespaces.Peer.CloudChannel || peerId.namespace == Namespaces.Peer.CloudGroup || peerId.namespace == Namespaces.Peer.CloudUser { let remoteMessageIds = peerMessageIds.filter { id in - if id.namespace == Namespaces.Message.Local { + if id.namespace == Namespaces.Message.Local || id.namespace == Namespaces.Message.ScheduledLocal { return false } return true diff --git a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift index f6fbf62026..2d6e5d2fdf 100644 --- a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift @@ -474,10 +474,10 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { override func setupItem(_ item: ChatMessageItem, synchronousLoad: Bool) { super.setupItem(item, synchronousLoad: synchronousLoad) - if item.message.id.namespace == Namespaces.Message.Local { + if item.message.id.namespace == Namespaces.Message.Local || item.message.id.namespace == Namespaces.Message.ScheduledLocal { self.wasPending = true } - if self.wasPending && item.message.id.namespace != Namespaces.Message.Local { + if self.wasPending && (item.message.id.namespace != Namespaces.Message.Local && item.message.id.namespace != Namespaces.Message.ScheduledLocal) { self.didChangeFromPendingToSent = true } diff --git a/submodules/TelegramUI/Sources/ChatMessageInstantVideoItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageInstantVideoItemNode.swift index 4291fba002..6fc9c5eddb 100644 --- a/submodules/TelegramUI/Sources/ChatMessageInstantVideoItemNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageInstantVideoItemNode.swift @@ -81,7 +81,7 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView, UIGestureRecognizerD self.interactiveVideoNode.shouldOpen = { [weak self] in if let strongSelf = self { - if let item = strongSelf.item, item.message.id.namespace == Namespaces.Message.Local { + if let item = strongSelf.item, (item.message.id.namespace == Namespaces.Message.Local || item.message.id.namespace == Namespaces.Message.ScheduledLocal) { return false } return !strongSelf.animatingHeight diff --git a/submodules/TelegramUI/Sources/ChatMessageInteractiveInstantVideoNode.swift b/submodules/TelegramUI/Sources/ChatMessageInteractiveInstantVideoNode.swift index 57a9143653..2e50baecd8 100644 --- a/submodules/TelegramUI/Sources/ChatMessageInteractiveInstantVideoNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageInteractiveInstantVideoNode.swift @@ -231,7 +231,7 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode { break } } - if item.message.id.namespace == Namespaces.Message.Local { + if item.message.id.namespace == Namespaces.Message.Local || item.message.id.namespace == Namespaces.Message.ScheduledLocal { notConsumed = true }