From eff4ad5e780bc5a51c9ae4eed05e045ee069440c Mon Sep 17 00:00:00 2001 From: Isaac <> Date: Fri, 2 Aug 2024 22:38:34 +0800 Subject: [PATCH] Don't delay message deletion when not necessary (cherry picked from commit ad4c5a181ba4b8739c83f3e5f47c2e0a8559c6a3) --- .../Sources/ChatControllerAdminBanUsers.swift | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/submodules/TelegramUI/Sources/ChatControllerAdminBanUsers.swift b/submodules/TelegramUI/Sources/ChatControllerAdminBanUsers.swift index 568e230870..fbad3ba82c 100644 --- a/submodules/TelegramUI/Sources/ChatControllerAdminBanUsers.swift +++ b/submodules/TelegramUI/Sources/ChatControllerAdminBanUsers.swift @@ -340,6 +340,20 @@ extension ChatControllerImpl { } func beginDeleteMessagesWithUndo(messageIds: Set, type: InteractiveMessagesDeletionType) { + var deleteImmediately = false + if case .forEveryone = type { + deleteImmediately = true + } else if case .scheduledMessages = self.presentationInterfaceState.subject { + deleteImmediately = true + } else if case .peer(self.context.account.peerId) = self.chatLocation { + deleteImmediately = true + } + + if deleteImmediately { + let _ = self.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: type).startStandalone() + return + } + self.chatDisplayNode.historyNode.ignoreMessageIds = Set(messageIds) let undoTitle = self.presentationData.strings.Chat_MessagesDeletedToast_Text(Int32(messageIds.count))