fix: update notification read status on refresh (#706)

Author: wesleynw

Splajompy.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -21,7 +21,8 @@ struct Notification: Identifiable, Decodable, Equatable {
   var post: Post?
   var comment: Comment?
 
-  var id: Int { notificationId }
+  // TODO: this is kind of a hack. in an ideal world we'd have an observable object for each notification
+  var id: String { "\(notificationId) \(viewed)" }
 
   var richContent: AttributedString {
     let markdown = generateAttributedStringUsingFacets(

Splajompy/Notifications/NotificationRepository.swift

@@ -9,7 +9,7 @@ struct NotificationRow: View {
       notification.hasNotificationActors == true
     {
       return .notificationActorsList(
-        notificationId: notification.id,
+        notificationId: notification.notificationId,
         postId: postId
       )
     } else if let postId = notification.postId {

Splajompy/Notifications/NotificationRow.swift

@@ -23,7 +23,7 @@ struct NotificationsView: View {
             notifications: notifications
           )
           .padding(.horizontal)
-          .task {
+          .task(id: viewModel.lastRefreshTime) {
             if viewModel.lastRefreshTime.addingTimeInterval(5) > Date() {
               do {
                 try await Task.sleep(for: .seconds(2))
@@ -82,6 +82,15 @@ struct NotificationsView: View {
         }
       }
     #else
+      .toolbar {
+        ToolbarItem {
+          Button("Refresh", systemImage: "arrow.clockwise") {
+            Task {
+              await viewModel.refreshNotifications()
+            }
+          }
+        }
+      }
       .navigationTitle("Notifications")
     #endif
   }
@@ -110,7 +119,7 @@ struct NotificationsView: View {
   private func notificationsList(
     notifications: [Notification]
   ) -> some View {
-    ForEach(notifications, id: \.notificationId) { notification in
+    ForEach(notifications) { notification in
       VStack {
         NotificationRow(notification: notification)
           #if os(macOS)

Splajompy/Notifications/NotificationsView.swift

@@ -70,7 +70,6 @@ extension NotificationsView {
 
       lastReadNotificationTime = nil
       lastUnreadNotificationTime = nil
-      lastRefreshTime = Date()
 
       async let unreadResult = service.getUnreadNotificationsWithTimeOffset(
         beforeTime: nil,
@@ -93,6 +92,7 @@ extension NotificationsView {
         lastReadNotificationTime = readNotifications.last?.createdAt
         hasMoreUnreadToLoad = unreadNotifications.count == limit
         hasMoreToLoad = readNotifications.count == limit
+        lastRefreshTime = Date()
       case (.failure(let error), _), (_, .failure(let error)):
         state = .failed(error)
       }
@@ -153,7 +153,7 @@ extension NotificationsView {
     func markNotificationAsRead(notificationId: Int) async {
       guard case .loaded(var notifications) = state else { return }
 
-      if let index = notifications.firstIndex(where: { $0.id == notificationId }
+      if let index = notifications.firstIndex(where: { $0.notificationId == notificationId }
       ) {
         notifications[index].viewed = true
       }