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

Fix deleted messages grouping in recent actions

Browse source
This commit is contained in:
Ilya Laktyushin 2026-04-28 00:13:22 +02:00
parent 12bb7a851c
commit 1dba0dbb65
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
submodules/TelegramUI/Components/Chat/ChatRecentActionsController/Sources/ChatRecentActionsHistoryTransition.swift
View file

@ -2367,6 +2367,8 @@ private let deletedMessagesDisplayedLimit = 4
func chatRecentActionsEntries(entries: [ChannelAdminEventLogEntry], presentationData: ChatPresentationData, expandedDeletedMessages: Set<EngineMessage.Id>, currentDeletedHeaderMessages: inout Set<EngineMessage.Id>) -> [ChatRecentActionsEntry] {
var result: [ChatRecentActionsEntry] = []
var deleteMessageEntries: [ChannelAdminEventLogEntry] = []
let previousDeletedHeaderMessages = currentDeletedHeaderMessages
currentDeletedHeaderMessages = Set()
func appendCurrentDeleteEntries() {
if !deleteMessageEntries.isEmpty, let lastEntry = deleteMessageEntries.last, let lastMessageId = lastEntry.event.action.messageId {
@ -2394,9 +2396,16 @@ func chatRecentActionsEntries(entries: [ChannelAdminEventLogEntry], presentation
var skipAppendingGeneralEntry = false
if case let .deleteMessage(message) = entry.event.action {
var skipAppendingDeletionEntry = false
if currentDeleteMessageEvent == nil || (currentDeleteMessageEvent!.peerId == entry.event.peerId && abs(currentDeleteMessageEvent!.date - entry.event.date) < 5 && !currentDeletedHeaderMessages.contains(message.id)) {
let belongsToCurrentDeleteGroup: Bool
if let currentDeleteMessageEvent {
belongsToCurrentDeleteGroup = currentDeleteMessageEvent.peerId == entry.event.peerId && abs(currentDeleteMessageEvent.date - entry.event.date) < 5
} else {
if currentDeletedHeaderMessages.contains(message.id) {
belongsToCurrentDeleteGroup = true
}
let wasPreviousHeaderMessage = previousDeletedHeaderMessages.contains(message.id)
if currentDeleteMessageEvent == nil || (belongsToCurrentDeleteGroup && !wasPreviousHeaderMessage) {
} else {
if belongsToCurrentDeleteGroup && wasPreviousHeaderMessage {
deleteMessageEntries.append(entry)
skipAppendingDeletionEntry = true
}