0013 patch
This commit is contained in:
1 parent
57eaf56023
commit
dee7e94e92
2 files changed
+79
-3
No files matched your search
@@ -442,12 +442,18 @@ struct ChatView: View {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
.onPreferenceChange(TimelineTopYPreferenceKey.self) { topY in
|
.onPreferenceChange(TimelineTopYPreferenceKey.self) { topY in
|
||||||
|
if topY > 24 {
|
||||||
|
historyTopTriggerArmed = true
|
||||||
|
return
|
||||||
|
}
|
||||||
guard hasCompletedInitialScroll,
|
guard hasCompletedInitialScroll,
|
||||||
!timelineEntries.isEmpty,
|
!timelineEntries.isEmpty,
|
||||||
model.hasMoreOlderHistory,
|
model.hasMoreOlderHistory,
|
||||||
!model.isLoadingOlderHistory,
|
!model.isLoadingOlderHistory,
|
||||||
topY <= 24
|
historyTopTriggerArmed
|
||||||
|
// topY <= 24
|
||||||
else { return }
|
else { return }
|
||||||
|
historyTopTriggerArmed = false
|
||||||
historyLoadAnchorID = timelineEntries.first?.id
|
historyLoadAnchorID = timelineEntries.first?.id
|
||||||
model.loadOlderHistoryForSelectedConversation()
|
model.loadOlderHistoryForSelectedConversation()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -303,6 +303,9 @@ final class XMPPService {
|
|||||||
let completion: (Result<Bool, Error>) -> Void
|
let completion: (Result<Bool, Error>) -> Void
|
||||||
}
|
}
|
||||||
private var pendingOlderHistoryRequest: PendingOlderHistoryRequest?
|
private var pendingOlderHistoryRequest: PendingOlderHistoryRequest?
|
||||||
|
private var olderHistoryQueryID: String?
|
||||||
|
private var olderHistoryTimeoutTask: Task<Void, Never>?
|
||||||
|
private let olderHistoryQueryTimeoutNanoseconds: UInt64 = 15_000_000_000
|
||||||
private let archiveStanzaInbox = ArchiveStanzaInbox(
|
private let archiveStanzaInbox = ArchiveStanzaInbox(
|
||||||
maximumCount: ArchiveMessageBatchPolicy.maximumBufferedStanzas
|
maximumCount: ArchiveMessageBatchPolicy.maximumBufferedStanzas
|
||||||
)
|
)
|
||||||
@@ -870,11 +873,22 @@ final class XMPPService {
|
|||||||
let archive = isGroup
|
let archive = isGroup
|
||||||
? MAMArchiveKey.muc(conversationJID)
|
? MAMArchiveKey.muc(conversationJID)
|
||||||
: MAMArchiveKey.account(client.userBareJid.stringValue)
|
: MAMArchiveKey.account(client.userBareJid.stringValue)
|
||||||
|
// Only one interactive backward-history query is allowed at a time.
|
||||||
|
// This is independent from the normal account/MUC catch-up query.
|
||||||
|
olderHistoryTimeoutTask?.cancel()
|
||||||
|
olderHistoryTimeoutTask = nil
|
||||||
let queryID = UUID().uuidString
|
let queryID = UUID().uuidString
|
||||||
|
olderHistoryQueryID = queryID
|
||||||
archiveStanzaInbox.begin(
|
archiveStanzaInbox.begin(
|
||||||
queryID: queryID,
|
queryID: queryID,
|
||||||
allowedSources: allowedMAMSources(for: archive, client: client)
|
allowedSources: allowedMAMSources(for: archive, client: client)
|
||||||
)
|
)
|
||||||
|
scheduleOlderHistoryTimeout(
|
||||||
|
client: client,
|
||||||
|
queryID: queryID,
|
||||||
|
conversationJID: conversationJID,
|
||||||
|
completion: completion
|
||||||
|
)
|
||||||
|
|
||||||
// Martin 3.2.4's convenience overload accidentally clears `with`.
|
// Martin 3.2.4's convenience overload accidentally clears `with`.
|
||||||
// Construct MAMQueryForm explicitly so direct-chat history is truly
|
// Construct MAMQueryForm explicitly so direct-chat history is truly
|
||||||
@@ -897,9 +911,16 @@ final class XMPPService {
|
|||||||
) { [weak self, weak client] result in
|
) { [weak self, weak client] result in
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
guard let self, let client else {
|
guard let self, let client else {
|
||||||
completion(.success(false))
|
// completion(.success(false))
|
||||||
|
completion(.failure(LumaXMPPError.notConnected))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
guard self.olderHistoryQueryID == queryID else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
self.olderHistoryTimeoutTask?.cancel()
|
||||||
|
self.olderHistoryTimeoutTask = nil
|
||||||
|
self.olderHistoryQueryID = nil
|
||||||
let page = self.archiveStanzaInbox.take(queryID: queryID)
|
let page = self.archiveStanzaInbox.take(queryID: queryID)
|
||||||
guard !page.overflowed, !page.rejectedSource else {
|
guard !page.overflowed, !page.rejectedSource else {
|
||||||
completion(.failure(LumaXMPPError.connection("Некорректная MAM history page")))
|
completion(.failure(LumaXMPPError.connection("Некорректная MAM history page")))
|
||||||
@@ -940,12 +961,50 @@ final class XMPPService {
|
|||||||
case .success(let response):
|
case .success(let response):
|
||||||
completion(.success(!response.complete))
|
completion(.success(!response.complete))
|
||||||
case .failure(let error):
|
case .failure(let error):
|
||||||
|
// Do not leave the UI in the loading state. A failed
|
||||||
|
// interactive query is recoverable by the next scroll.
|
||||||
completion(.failure(error))
|
completion(.failure(error))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private func scheduleOlderHistoryTimeout(
|
||||||
|
client: XMPPClient,
|
||||||
|
queryID: String,
|
||||||
|
conversationJID: String,
|
||||||
|
completion: @escaping (Result<Bool, Error>) -> Void
|
||||||
|
) {
|
||||||
|
olderHistoryTimeoutTask?.cancel()
|
||||||
|
olderHistoryTimeoutTask = Task { @MainActor [weak self, weak client] in
|
||||||
|
try? await Task.sleep(nanoseconds: self?.olderHistoryQueryTimeoutNanoseconds ?? 15_000_000_000)
|
||||||
|
guard !Task.isCancelled,
|
||||||
|
let self,
|
||||||
|
let client,
|
||||||
|
self.client === client,
|
||||||
|
self.olderHistoryQueryID == queryID
|
||||||
|
else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
self.olderHistoryQueryID = nil
|
||||||
|
self.olderHistoryTimeoutTask = nil
|
||||||
|
self.archiveStanzaInbox.cancel(queryID: queryID)
|
||||||
|
self.eventHandler?(
|
||||||
|
.recoverableError(
|
||||||
|
"Не удалось загрузить более старую историю чата \(conversationJID): MAM не ответил за 15 секунд."
|
||||||
|
)
|
||||||
|
)
|
||||||
|
completion(
|
||||||
|
.failure(
|
||||||
|
LumaXMPPError.connection(
|
||||||
|
"MAM не ответил вовремя. Повторите прокрутку вверх."
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private func startPendingOlderHistoryIfPossible() {
|
private func startPendingOlderHistoryIfPossible() {
|
||||||
guard !archiveSyncStarted,
|
guard !archiveSyncStarted,
|
||||||
activeMUCCatchup == nil,
|
activeMUCCatchup == nil,
|
||||||
@@ -3293,9 +3352,17 @@ final class XMPPService {
|
|||||||
|
|
||||||
private func suspendArchiveSyncForDisconnect() {
|
private func suspendArchiveSyncForDisconnect() {
|
||||||
setArchiveSyncIndicator(false)
|
setArchiveSyncIndicator(false)
|
||||||
|
olderHistoryTimeoutTask?.cancel()
|
||||||
|
olderHistoryTimeoutTask = nil
|
||||||
|
olderHistoryQueryID = nil
|
||||||
|
archiveStanzaInbox.cancel()
|
||||||
|
if let pending = pendingOlderHistoryRequest {
|
||||||
|
pendingOlderHistoryRequest = nil
|
||||||
|
pending.completion(.failure(LumaXMPPError.notConnected))
|
||||||
|
}
|
||||||
guard let client else {
|
guard let client else {
|
||||||
archiveSyncStarted = false
|
archiveSyncStarted = false
|
||||||
archiveStanzaInbox.cancel()
|
// archiveStanzaInbox.cancel()
|
||||||
archiveActiveQueryID = nil
|
archiveActiveQueryID = nil
|
||||||
archiveStanzaBuffer.removeAll(keepingCapacity: false)
|
archiveStanzaBuffer.removeAll(keepingCapacity: false)
|
||||||
archiveBufferOverflowed = false
|
archiveBufferOverflowed = false
|
||||||
@@ -3341,6 +3408,9 @@ final class XMPPService {
|
|||||||
archiveQueryCompletionTask?.cancel()
|
archiveQueryCompletionTask?.cancel()
|
||||||
archiveQueryCompletionTask = nil
|
archiveQueryCompletionTask = nil
|
||||||
archiveStanzaInbox.cancel()
|
archiveStanzaInbox.cancel()
|
||||||
|
olderHistoryTimeoutTask?.cancel()
|
||||||
|
olderHistoryTimeoutTask = nil
|
||||||
|
olderHistoryQueryID = nil
|
||||||
archiveResumeAfter = archiveSyncCheckpoint?.cursor
|
archiveResumeAfter = archiveSyncCheckpoint?.cursor
|
||||||
archiveActiveQueryID = nil
|
archiveActiveQueryID = nil
|
||||||
archiveSyncStarted = false
|
archiveSyncStarted = false
|
||||||
|
|||||||
Reference in new issue
Block a user