From 38ac5858a9a09ae0888144af16494e9a80b59578 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Sat, 25 Feb 2023 16:39:00 -0500 Subject: [PATCH] Don't check present when refreshing timeline --- .../Timeline/TimelineViewController.swift | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/Tusker/Screens/Timeline/TimelineViewController.swift b/Tusker/Screens/Timeline/TimelineViewController.swift index c35280bd..db003822 100644 --- a/Tusker/Screens/Timeline/TimelineViewController.swift +++ b/Tusker/Screens/Timeline/TimelineViewController.swift @@ -718,27 +718,15 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro } @objc func refresh() { - Task { + Task { @MainActor in if case .notLoadedInitial = controller.state { await controller.loadInitial() - #if !targetEnvironment(macCatalyst) - collectionView.refreshControl?.endRefreshing() - #endif } else { - @MainActor - func loadNewerAndEndRefreshing() async { - await controller.loadNewer() - #if !targetEnvironment(macCatalyst) - collectionView.refreshControl?.endRefreshing() - #endif - } - - // I'm not sure whether this should move into TimelineLikeController/TimelineLikeCollectionViewController - let (_, presentItems) = await (loadNewerAndEndRefreshing(), try? loadInitial()) - if let presentItems, !presentItems.isEmpty { - insertPresentItemsAndShowJumpToast(presentItems) - } + await controller.loadNewer() } + #if !targetEnvironment(macCatalyst) + collectionView.refreshControl?.endRefreshing() + #endif } }