Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

This commit is contained in:
Ilya Laktyushin 2023-12-19 22:55:35 +04:00
commit 4cca16b10d

View File

@ -3002,16 +3002,21 @@ public final class ChatHistoryListNodeImpl: ListView, ChatHistoryNode, ChatHisto
} }
} }
case let .MessageGroupEntry(_, messages, _): case let .MessageGroupEntry(_, messages, _):
for message in messages { var isRemoved = true
if !existingStableIds.contains(message.0.stableId) { inner: for message in messages {
if let autoremoveAttribute = message.0.autoremoveAttribute, let countdownBeginTime = autoremoveAttribute.countdownBeginTime { if existingStableIds.contains(message.0.stableId) {
let exipiresAt = countdownBeginTime + autoremoveAttribute.timeout isRemoved = false
if exipiresAt >= currentTimestamp - 1 { break inner
expiredMessageStableIds.insert(message.0.stableId) }
} else { }
expiredMessageStableIds.insert(message.0.stableId) if isRemoved, let message = messages.first?.0 {
} if let autoremoveAttribute = message.autoremoveAttribute, let countdownBeginTime = autoremoveAttribute.countdownBeginTime {
let exipiresAt = countdownBeginTime + autoremoveAttribute.timeout
if exipiresAt >= currentTimestamp - 1 {
expiredMessageStableIds.insert(message.stableId)
} }
} else {
expiredMessageStableIds.insert(message.stableId)
} }
} }
default: default: