Skip to content

Commit 8df0a69

Browse files
author
Peter
committed
Extend secret media autoremove timeout to media duration
1 parent 3565d29 commit 8df0a69

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

‎submodules/TelegramCore/TelegramCore/MarkMessageContentAsConsumedInteractively.swift‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,14 @@ public func markMessageContentAsConsumedInteractively(postbox: Postbox, messageI
5757
for i in 0 ..< updatedAttributes.count {
5858
if let attribute = updatedAttributes[i] as? AutoremoveTimeoutMessageAttribute {
5959
if attribute.countdownBeginTime == nil || attribute.countdownBeginTime == 0 {
60-
updatedAttributes[i] = AutoremoveTimeoutMessageAttribute(timeout: attribute.timeout, countdownBeginTime: timestamp)
60+
var timeout = attribute.timeout
61+
if let duration = message.secretMediaDuration {
62+
timeout = max(timeout, duration)
63+
}
64+
updatedAttributes[i] = AutoremoveTimeoutMessageAttribute(timeout: timeout, countdownBeginTime: timestamp)
6165
updateMessage = true
6266

63-
transaction.addTimestampBasedMessageAttribute(tag: 0, timestamp: timestamp + attribute.timeout, messageId: messageId)
67+
transaction.addTimestampBasedMessageAttribute(tag: 0, timestamp: timestamp + timeout, messageId: messageId)
6468

6569
if messageId.peerId.namespace == Namespaces.Peer.SecretChat {
6670
var layer: SecretChatLayer?

0 commit comments

Comments
 (0)