Tusker/Screens/Attachment Gallery/GalleryPlayerViewController.swift

@@ -16,8 +16,6 @@ class GalleryPlayerViewController: UIViewController {
     
     var attachment: Attachment!
     
-    private var isFirstAppearance = true
-    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -46,13 +44,6 @@ class GalleryPlayerViewController: UIViewController {
         DispatchQueue.global(qos: .userInitiated).async {
             AudioSessionHelper.enable()
             AudioSessionHelper.setVideoPlayback()
-            
-            DispatchQueue.main.async {
-                if self.isFirstAppearance {
-                    self.isFirstAppearance = false
-                    self.playerVC.player?.play()
-                }
-            }
         }
     }
 

Tusker/Screens/Timeline/TimelineViewController.swift

@@ -334,31 +334,25 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
             return false
         }
         loadViewIfNeeded()
-        var loaded = false
         await controller.restoreInitial {
-            let hasStatusesToRestore = await loadStatusesToRestore(position: position)
+            await loadStatusesToRestore(position: position)
-            if hasStatusesToRestore {
+            applyItemsToRestore(position: position)
-                applyItemsToRestore(position: position)
-                loaded = true
-            }
         }
-        return loaded
+        return true
     }
     
     @MainActor
-    private func loadStatusesToRestore(position: TimelinePosition) async -> Bool {
+    private func loadStatusesToRestore(position: TimelinePosition) async {
         let unloaded = position.statusIDs.filter({ mastodonController.persistentContainer.status(for: $0) == nil })
         guard !unloaded.isEmpty else {
-            return true
+            return
         }
         let statuses = await withTaskGroup(of: Status?.self) { group -> [Status] in
             for id in unloaded {
-                group.addTask {
+                group.addTask { @MainActor in
-                    do {
+                    if let (status, _) = try? await self.mastodonController.run(Client.getStatus(id: id)) {
-                        let (status, _) = try await self.mastodonController.run(Client.getStatus(id: id))
                         return status
-                    } catch {
+                    } else {
-                        print(error)
                         return nil
                     }
                 }
@@ -370,20 +364,6 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
             }
         }
         await mastodonController.persistentContainer.addAll(statuses: statuses, in: mastodonController.persistentContainer.viewContext)
-        
-        // update the timeline position in case some statuses couldn't be loaded
-        if let center = position.centerStatusID {
-            let nearestLoadedStatusToCenter = position.statusIDs[position.statusIDs.firstIndex(of: center)!...].first(where: { id in
-                // was already loaded or was just now loaded
-                !unloaded.contains(id) || statuses.contains(where: { $0.id == id })
-            })
-            position.centerStatusID = nearestLoadedStatusToCenter
-        }
-        position.statusIDs = position.statusIDs.filter { id in
-            !unloaded.contains(id) || statuses.contains(where: { $0.id == id })
-        }
-        
-        return !position.statusIDs.isEmpty
     }
     
     private func applyItemsToRestore(position: TimelinePosition) {