mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-16 05:55:20 +00:00
Temporarily roll back autoremove changes
This commit is contained in:
parent
244196ec28
commit
64dbe6112a
@ -43,7 +43,7 @@ func managedAutoremoveMessageOperations(network: Network, postbox: Postbox, isRe
|
|||||||
return Signal { _ in
|
return Signal { _ in
|
||||||
let helper = Atomic(value: ManagedAutoremoveMessageOperationsHelper())
|
let helper = Atomic(value: ManagedAutoremoveMessageOperationsHelper())
|
||||||
|
|
||||||
let timeOffsetOnce = Signal<Double, NoError> { subscriber in
|
/*let timeOffsetOnce = Signal<Double, NoError> { subscriber in
|
||||||
subscriber.putNext(network.globalTimeDifference)
|
subscriber.putNext(network.globalTimeDifference)
|
||||||
return EmptyDisposable
|
return EmptyDisposable
|
||||||
}
|
}
|
||||||
@ -59,7 +59,9 @@ func managedAutoremoveMessageOperations(network: Network, postbox: Postbox, isRe
|
|||||||
|> map { value -> Double in
|
|> map { value -> Double in
|
||||||
round(value)
|
round(value)
|
||||||
}
|
}
|
||||||
|> distinctUntilChanged
|
|> distinctUntilChanged*/
|
||||||
|
|
||||||
|
let timeOffset: Signal<Double, NoError> = .single(0.0)
|
||||||
|
|
||||||
let disposable = combineLatest(timeOffset, postbox.timestampBasedMessageAttributesView(tag: isRemove ? 0 : 1)).start(next: { timeOffset, view in
|
let disposable = combineLatest(timeOffset, postbox.timestampBasedMessageAttributesView(tag: isRemove ? 0 : 1)).start(next: { timeOffset, view in
|
||||||
let (disposeOperations, beginOperations) = helper.with { helper -> (disposeOperations: [Disposable], beginOperations: [(TimestampBasedMessageAttributesEntry, MetaDisposable)]) in
|
let (disposeOperations, beginOperations) = helper.with { helper -> (disposeOperations: [Disposable], beginOperations: [(TimestampBasedMessageAttributesEntry, MetaDisposable)]) in
|
||||||
@ -72,8 +74,10 @@ func managedAutoremoveMessageOperations(network: Network, postbox: Postbox, isRe
|
|||||||
|
|
||||||
for (entry, disposable) in beginOperations {
|
for (entry, disposable) in beginOperations {
|
||||||
let timestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970 + timeOffset
|
let timestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970 + timeOffset
|
||||||
|
let delay = max(0.0, Double(entry.timestamp) - timestamp)
|
||||||
|
Logger.shared.log("Autoremove", "Scheduling autoremove for \(entry.messageId) at \(entry.timestamp) (in \(delay) seconds)")
|
||||||
let signal = Signal<Void, NoError>.complete()
|
let signal = Signal<Void, NoError>.complete()
|
||||||
|> suspendAwareDelay(max(0.0, Double(entry.timestamp) - timestamp), queue: Queue.concurrentDefaultQueue())
|
|> suspendAwareDelay(delay, queue: Queue.concurrentDefaultQueue())
|
||||||
|> then(postbox.transaction { transaction -> Void in
|
|> then(postbox.transaction { transaction -> Void in
|
||||||
if let message = transaction.getMessage(entry.messageId) {
|
if let message = transaction.getMessage(entry.messageId) {
|
||||||
if message.id.peerId.namespace == Namespaces.Peer.SecretChat || isRemove {
|
if message.id.peerId.namespace == Namespaces.Peer.SecretChat || isRemove {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user