mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2026-01-22 20:18:44 +00:00
Cherry-pick media timer and web app improvements
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
import Foundation
|
||||
import Postbox
|
||||
|
||||
public let viewOnceTimeout: Int32 = 0x7fffffff
|
||||
|
||||
public class AutoremoveTimeoutMessageAttribute: MessageAttribute {
|
||||
public let timeout: Int32
|
||||
public let countdownBeginTime: Int32?
|
||||
@@ -54,7 +56,11 @@ public class AutoclearTimeoutMessageAttribute: MessageAttribute {
|
||||
self.countdownBeginTime = countdownBeginTime
|
||||
|
||||
if let countdownBeginTime = countdownBeginTime {
|
||||
self.automaticTimestampBasedAttribute = (1, countdownBeginTime + timeout)
|
||||
if self.timeout == viewOnceTimeout {
|
||||
self.automaticTimestampBasedAttribute = (1, countdownBeginTime)
|
||||
} else {
|
||||
self.automaticTimestampBasedAttribute = (1, countdownBeginTime + timeout)
|
||||
}
|
||||
} else {
|
||||
self.automaticTimestampBasedAttribute = nil
|
||||
}
|
||||
@@ -65,7 +71,11 @@ public class AutoclearTimeoutMessageAttribute: MessageAttribute {
|
||||
self.countdownBeginTime = decoder.decodeOptionalInt32ForKey("c")
|
||||
|
||||
if let countdownBeginTime = self.countdownBeginTime {
|
||||
self.automaticTimestampBasedAttribute = (1, countdownBeginTime + self.timeout)
|
||||
if self.timeout == viewOnceTimeout {
|
||||
self.automaticTimestampBasedAttribute = (1, countdownBeginTime)
|
||||
} else {
|
||||
self.automaticTimestampBasedAttribute = (1, countdownBeginTime + self.timeout)
|
||||
}
|
||||
} else {
|
||||
self.automaticTimestampBasedAttribute = nil
|
||||
}
|
||||
@@ -124,7 +134,7 @@ public extension Message {
|
||||
guard let timeout = self.minAutoremoveOrClearTimeout else {
|
||||
return false
|
||||
}
|
||||
if timeout > 1 * 60 {
|
||||
if timeout > 1 * 60 && timeout != viewOnceTimeout {
|
||||
return false
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user