Pixelfed
/
Vernissage
mirror of https://github.com/VernissageApp/Vernissage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issue with loading data whuc has not been visible yet

This commit is contained in:
Marcin Czachurski 2023-10-20 18:24:16 +02:00
parent fffb477cb5
commit 28df8b940e
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Vernissage/Services/HomeTimelineService.swift
View File

@ -103,7 +103,6 @@ public class HomeTimelineService {
visibleStatuses.append(status)
}
print("statuses: \(statuses.count), withImages: \(statusesWithImagesOnly.count), visible: \(visibleStatuses.count)")
return visibleStatuses
}

23
Vernissage/Views/HomeTimelineView.swift
View File

@ -168,12 +168,16 @@ struct HomeTimelineView: View {
}
private func loadFirstStatuses() async throws {
guard let accountId = self.applicationState.account?.id else {
guard let accountId = self.applicationState.account?.id,
let accountData = AccountDataHandler.shared.getAccountData(accountId: accountId, modelContext: modelContext) else {
return
}
// Download statuses from API.
let statuses = try await self.loadFromApi()
// We have to download one newer status Id.
let newerStatusId = try await self.getNewerStatusId(from: accountData.lastLoadedStatusId)
// Download statuses from API (which are older then last visible status).
let statuses = try await self.loadFromApi(maxId: newerStatusId)
if statuses.isEmpty {
self.allItemsLoaded = true
@ -325,4 +329,17 @@ struct HomeTimelineView: View {
private func shouldUpToDateBeVisible(statusId: String) -> Bool {
return self.applicationState.lastSeenStatusId != statusViewModels.first?.id && self.applicationState.lastSeenStatusId == statusId
}
private func getNewerStatusId(from statusId: String?) async throws -> String? {
guard let statusId else {
return nil
}
let statuses = try await self.client.publicTimeline?.getHomeTimeline(
minId: statusId,
limit: 1,
includeReblogs: self.applicationState.showReboostedStatuses) ?? []
return statuses.first?.id
}
}