Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refine timestamp logics

Browse source
This commit is contained in:
Alfonso Grillo 2023-01-26 10:09:28 +01:00
parent ef6910a5f9
commit 31ca4e3e38
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
RiotSwiftUI/Modules/Room/PollHistory/Service/MatrixSDK/PollHistoryService.swift
View file

@ -38,8 +38,8 @@ final class PollHistoryService: PollHistoryServiceProtocol {
private let pollErrorsSubject: PassthroughSubject<Error, Never> = .init()
// timestamps
private var targetTimestamp: Date?
private var oldestEventDateSubject: CurrentValueSubject<Date, Never> = .init(Date.distantFuture)
private var targetTimestamp: Date = .init()
private var oldestEventDateSubject: CurrentValueSubject<Date, Never> = .init(.init())
var updates: AnyPublisher<TimelinePollDetails, Never> {
updatesSubject.eraseToAnyPublisher()
@ -83,7 +83,7 @@ final class PollHistoryService: PollHistoryServiceProtocol {
class PollAggregationContext {
var pollAggregator: PollAggregator?
let isLivePoll: Bool
var published: Bool = false
var published: Bool
init(pollAggregator: PollAggregator? = nil, isLivePoll: Bool, published: Bool = false) {
self.pollAggregator = pollAggregator
@ -123,7 +123,7 @@ private extension PollHistoryService {
}
func startPagination() -> AnyPublisher<TimelinePollDetails, Error> {
let startingTimestamp = targetTimestamp ?? .init()
let startingTimestamp = oldestEventDate
targetTimestamp = startingTimestamp.subtractingDays(chunkSizeInDays)
let batchSubject = PassthroughSubject<TimelinePollDetails, Error>()
@ -181,10 +181,7 @@ private extension PollHistoryService {
}
var timestampTargetReached: Bool {
guard let targetTimestamp = targetTimestamp else {
return true
}
return oldestEventDate <= targetTimestamp
oldestEventDate <= targetTimestamp
}
var oldestEventDate: Date {
@ -212,7 +209,7 @@ private extension MXEvent {
// MARK: - PollAggregatorDelegate
extension PollHistoryService: PollAggregatorDelegate {
func pollAggregatorDidStartLoading(_ aggregator: PollAggregator) {}
func pollAggregatorDidStartLoading(_ aggregator: PollAggregator) { }
func pollAggregatorDidEndLoading(_ aggregator: PollAggregator) {
guard let context = pollAggregationContexts[aggregator.poll.id], !context.published else {