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

Fix amount of new notifications indicator

This commit is contained in:
Marcin Czachurski 2023-10-24 16:02:02 +02:00
parent 8de6c937ec
commit bd56408ce8
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Vernissage/Services/NotificationsService.swift
View File

@ -67,16 +67,20 @@ public class NotificationsService {
// There can be more then 80 newest notifications, that's why we have to sometimes send more then one request.
while true {
do {
let downloadedNotifications = try await client.notifications(minId: newestNotificationId, limit: 80)
let linkable = try await client.notifications(minId: newestNotificationId, limit: 80)
let visibleNotifications = linkable.data.filter({ $0.id != lastSeenNotificationId })
guard let firstNotification = downloadedNotifications.data.first else {
guard let firstNotification = visibleNotifications.first else {
break
}
notifications.append(contentsOf: visibleNotifications)
guard let minId = linkable.link?.minId else {
break
}
let visibleNotifications = downloadedNotifications.data.filter({ $0.id != lastSeenNotificationId })
notifications.append(contentsOf: visibleNotifications)
newestNotificationId = firstNotification.id
newestNotificationId = minId
} catch {
ErrorService.shared.handle(error, message: "global.error.errorDuringDownloadingNewStatuses")
break

2
Vernissage/VernissageApp.swift
View File

@ -241,7 +241,7 @@ struct VernissageApp: App {
let modelContext = self.modelContainer.mainContext
if let account = self.applicationState.account {
self.applicationState.amountOfNewStatuses = await NotificationsService.shared.amountOfNewNotifications(for: account, modelContext: modelContext)
self.applicationState.amountOfNewNotifications = await NotificationsService.shared.amountOfNewNotifications(for: account, modelContext: modelContext)
try? await NotificationsService.shared.setBadgeCount(self.applicationState.amountOfNewStatuses)
} else {
try? await NotificationsService.shared.setBadgeCount(0)