diff --git a/Tusker/Screens/Notifications/NotificationsTableViewController.swift b/Tusker/Screens/Notifications/NotificationsTableViewController.swift index 81564d43..f7fbe1d3 100644 --- a/Tusker/Screens/Notifications/NotificationsTableViewController.swift +++ b/Tusker/Screens/Notifications/NotificationsTableViewController.swift @@ -112,12 +112,12 @@ class NotificationsTableViewController: DiffableTimelineLikeTableViewController< case let .failure(error): completion(.failure(.client(error))) - case let .success(notifications, _): + case let .success(notifications, pagination): let groups = NotificationGroup.createGroups(notifications: notifications, only: self.groupTypes) if !notifications.isEmpty { - self.newer = .after(id: notifications.first!.id, count: nil) - self.older = .before(id: notifications.last!.id, count: nil) + self.newer = pagination?.newer ?? .after(id: notifications.first!.id, count: nil) + self.older = pagination?.older ?? .before(id: notifications.last!.id, count: nil) } self.mastodonController.persistentContainer.addAll(notifications: notifications) { @@ -142,9 +142,9 @@ class NotificationsTableViewController: DiffableTimelineLikeTableViewController< case let .failure(error): completion(.failure(.client(error))) - case let .success(newNotifications, _): + case let .success(newNotifications, pagination): if !newNotifications.isEmpty { - self.older = .before(id: newNotifications.last!.id, count: nil) + self.older = pagination?.older ?? .before(id: newNotifications.last!.id, count: nil) } let olderGroups = NotificationGroup.createGroups(notifications: newNotifications, only: self.groupTypes) @@ -173,13 +173,13 @@ class NotificationsTableViewController: DiffableTimelineLikeTableViewController< case let .failure(error): completion(.failure(.client(error))) - case let .success(newNotifications, _): + case let .success(newNotifications, pagination): guard !newNotifications.isEmpty else { completion(.failure(.allCaughtUp)) return } - self.newer = .after(id: newNotifications.first!.id, count: nil) + self.newer = pagination?.newer ?? .after(id: newNotifications.first!.id, count: nil) let newerGroups = NotificationGroup.createGroups(notifications: newNotifications, only: self.groupTypes) diff --git a/Tusker/Screens/Profile/ProfileStatusesViewController.swift b/Tusker/Screens/Profile/ProfileStatusesViewController.swift index d5df51e4..23ee8119 100644 --- a/Tusker/Screens/Profile/ProfileStatusesViewController.swift +++ b/Tusker/Screens/Profile/ProfileStatusesViewController.swift @@ -88,10 +88,10 @@ class ProfileStatusesViewController: DiffableTimelineLikeTableViewController