ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 22:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into features/64-bit

Browse Source
This commit is contained in:
Ali
2021-07-05 00:50:38 +04:00
parent 645686b2a6 4893e41de2
commit 4776730243
73 changed files with 5808 additions and 5451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
submodules/TelegramCore/Sources/State/AccountViewTracker.swift
View File

@@ -224,9 +224,21 @@ private final class CachedChannelParticipantsContext {
private final class ChannelPollingContext {
var subscribers = Bag<Void>()
let disposable = MetaDisposable()
let isUpdated = Promise<Bool>(false)
private(set) var isUpdatedValue: Bool = false
private var isUpdatedDisposable: Disposable?
init(queue: Queue) {
self.isUpdatedDisposable = (self.isUpdated.get()
|> deliverOn(queue)).start(next: { [weak self] value in
self?.isUpdatedValue = value
})
}
deinit {
self.disposable.dispose()
self.isUpdatedDisposable?.dispose()
}
}
@@ -1302,13 +1314,27 @@ public final class AccountViewTracker {
if let current = self.channelPollingContexts[peerId] {
context = current
} else {
context = ChannelPollingContext()
context = ChannelPollingContext(queue: self.queue)
self.channelPollingContexts[peerId] = context
}
if context.subscribers.isEmpty {
if let account = self.account {
context.disposable.set(keepPollingChannel(postbox: account.postbox, network: account.network, peerId: peerId, stateManager: account.stateManager).start())
let queue = self.queue
context.disposable.set(keepPollingChannel(postbox: account.postbox, network: account.network, peerId: peerId, stateManager: account.stateManager).start(next: { [weak context] isValidForTimeout in
queue.async {
guard let context = context else {
return
}
context.isUpdated.set(
.single(true)
|> then(
.single(false)
|> delay(Double(isValidForTimeout), queue: queue)
)
)
}
}))
}
}
@@ -1378,34 +1404,68 @@ public final class AccountViewTracker {
peerId = peerIdValue
}
if peerId.namespace == Namespaces.Peer.CloudChannel {
return Signal { subscriber in
return Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> { subscriber in
let combinedDisposable = MetaDisposable()
self.queue.async {
let polled = self.polledChannel(peerId: peerId).start()
var addHole = false
let pollingCompleted: Signal<Bool, NoError>
if let context = self.channelPollingContexts[peerId] {
if context.subscribers.isEmpty {
if !context.isUpdatedValue {
addHole = true
}
pollingCompleted = context.isUpdated.get()
} else {
addHole = true
pollingCompleted = .single(true)
}
if addHole {
let _ = self.account?.postbox.transaction({ transaction -> Void in
if transaction.getPeerChatListIndex(peerId) == nil {
if let message = transaction.getTopPeerMessageId(peerId: peerId, namespace: Namespaces.Message.Cloud) {
//transaction.addHole(peerId: peerId, namespace: Namespaces.Message.Cloud, space: .everywhere, range: message.id + 1 ... (Int32.max - 1))
}
let isAutomaticallyTracked = self.account!.postbox.transaction { transaction -> Bool in
if transaction.getPeerChatListIndex(peerId) == nil {
if addHole {
transaction.addHole(peerId: peerId, namespace: Namespaces.Message.Cloud, space: .everywhere, range: 1 ... (Int32.max - 1))
}
}).start()
return false
} else {
return true
}
}
let disposable = history.start(next: { next in
let historyIsValid = combineLatest(queue: self.queue,
pollingCompleted,
isAutomaticallyTracked
)
|> map { lhs, rhs -> Bool in
return lhs || rhs
}
var loaded = false
let validHistory = historyIsValid
|> distinctUntilChanged
|> take(until: { next in
if next {
return SignalTakeAction(passthrough: true, complete: true)
} else {
return SignalTakeAction(passthrough: true, complete: false)
}
})
|> mapToSignal { isValid -> Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> in
if isValid {
assert(!loaded)
loaded = true
return history
} else {
let view = MessageHistoryView(tagMask: nil, namespaces: .all, entries: [], holeEarlier: true, holeLater: true, isLoading: true)
return .single((view, .Initial, nil))
}
}
let disposable = validHistory.start(next: { next in
subscriber.putNext(next)
}, error: { error in
subscriber.putError(error)
}, completed: {
subscriber.putCompletion()
})
let polled = self.polledChannel(peerId: peerId).start()
combinedDisposable.set(ActionDisposable {
disposable.dispose()
polled.dispose()