From 27b39b79e658345adf7aff3dfae17be7e9ea7042 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Tue, 12 Jan 2021 22:32:14 -0500
Subject: [PATCH] Fix refreshes after no-result refresh not working

Fixes #117
---
 .../Notifications/NotificationsTableViewController.swift    | 4 +++-
 Tusker/Screens/Profile/ProfileStatusesViewController.swift  | 4 +++-
 Tusker/Screens/Timeline/TimelineTableViewController.swift   | 6 +++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Tusker/Screens/Notifications/NotificationsTableViewController.swift b/Tusker/Screens/Notifications/NotificationsTableViewController.swift
index 24792cea..e4263650 100644
--- a/Tusker/Screens/Notifications/NotificationsTableViewController.swift
+++ b/Tusker/Screens/Notifications/NotificationsTableViewController.swift
@@ -98,7 +98,9 @@ class NotificationsTableViewController: TimelineLikeTableViewController<Notifica
         mastodonController.run(request) { (response) in
             guard case let .success(newNotifications, pagination) = response else { fatalError() }
             
-            self.newer = pagination?.newer
+            if let newer = pagination?.newer {
+                self.newer = newer
+            }
             
             let groups = NotificationGroup.createGroups(notifications: newNotifications, only: self.groupTypes)
             
diff --git a/Tusker/Screens/Profile/ProfileStatusesViewController.swift b/Tusker/Screens/Profile/ProfileStatusesViewController.swift
index ca39f622..5deec70a 100644
--- a/Tusker/Screens/Profile/ProfileStatusesViewController.swift
+++ b/Tusker/Screens/Profile/ProfileStatusesViewController.swift
@@ -145,7 +145,9 @@ class ProfileStatusesViewController: TimelineLikeTableViewController<TimelineEnt
                 return
             }
             
-            self.newer = pagination?.newer
+            if let newer = pagination?.newer {
+                self.newer = newer
+            }
             
             self.mastodonController.persistentContainer.addAll(statuses: statuses) {
                 completion(statuses.map { ($0.id, .unknown) })
diff --git a/Tusker/Screens/Timeline/TimelineTableViewController.swift b/Tusker/Screens/Timeline/TimelineTableViewController.swift
index a19fa0c7..9f13b982 100644
--- a/Tusker/Screens/Timeline/TimelineTableViewController.swift
+++ b/Tusker/Screens/Timeline/TimelineTableViewController.swift
@@ -113,7 +113,11 @@ class TimelineTableViewController: TimelineLikeTableViewController<TimelineEntry
         mastodonController.run(request) { (response) in
             guard case let .success(statuses, pagination) = response else { fatalError() }
             
-            self.newer = pagination?.newer
+            // if there are no new statuses, pagination is nil
+            // if we were to then overwrite self.newer, future refreshes would fail
+            if let newer = pagination?.newer {
+                self.newer = newer
+            }
             
             self.mastodonController?.persistentContainer.addAll(statuses: statuses) {
                 completion(statuses.map { ($0.id, .unknown) })