Tusker/CoreData/MastodonCachePersistentStore.swift

@@ -10,9 +10,6 @@ import Foundation
 import CoreData
 import Pachyderm
 import Combine
-import OSLog
-
-fileprivate let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "PersistentStore")
 
 class MastodonCachePersistentStore: NSPersistentContainer {
     
@@ -52,8 +49,7 @@ class MastodonCachePersistentStore: NSPersistentContainer {
         
         loadPersistentStores { (description, error) in
             if let error = error {
-                logger.error("Unable to load persistent store: \(String(describing: error), privacy: .public)")
+                fatalError("Unable to load persistent store: \(error)")
-                fatalError("Unable to load persistent store")
             }
         }
         
@@ -62,18 +58,6 @@ class MastodonCachePersistentStore: NSPersistentContainer {
         NotificationCenter.default.addObserver(self, selector: #selector(managedObjectsDidChange), name: .NSManagedObjectContextObjectsDidChange, object: viewContext)
     }
     
-    func save(context: NSManagedObjectContext) {
-        guard context.hasChanges else {
-            return
-        }
-        do {
-            try context.save()
-        } catch {
-            logger.error("Unable to save managed object context: \(String(describing: error), privacy: .public)")
-            fatalError("Unable to save managed object context")
-        }
-    }
-    
     func status(for id: String, in context: NSManagedObjectContext? = nil) -> StatusMO? {
         let context = context ?? viewContext
         let request: NSFetchRequest<StatusMO> = StatusMO.fetchRequest()
@@ -100,7 +84,9 @@ class MastodonCachePersistentStore: NSPersistentContainer {
         let context = context ?? backgroundContext
         context.perform {
             let statusMO = self.upsert(status: status, context: context)
-            self.save(context: context)
+            if context.hasChanges {
+                try! context.save()
+            }
             completion?(statusMO)
             self.statusSubject.send(status.id)
         }
@@ -109,7 +95,9 @@ class MastodonCachePersistentStore: NSPersistentContainer {
     @MainActor
     func addOrUpdateOnViewContext(status: Status) -> StatusMO {
         let statusMO = self.upsert(status: status, context: viewContext)
-        self.save(context: viewContext)
+        if viewContext.hasChanges {
+            try! viewContext.save()
+        }
         statusSubject.send(status.id)
         return statusMO
     }
@@ -117,7 +105,9 @@ class MastodonCachePersistentStore: NSPersistentContainer {
     func addAll(statuses: [Status], completion: (() -> Void)? = nil) {
         backgroundContext.perform {
             statuses.forEach { self.upsert(status: $0, context: self.backgroundContext) }
-            self.save(context: self.backgroundContext)
+            if self.backgroundContext.hasChanges {
+                try! self.backgroundContext.save()
+            }
             statuses.forEach { self.statusSubject.send($0.id) }
             completion?()
         }
@@ -156,7 +146,9 @@ class MastodonCachePersistentStore: NSPersistentContainer {
     func addOrUpdate(account: Account, completion: ((AccountMO) -> Void)? = nil) {
         backgroundContext.perform {
             let accountMO = self.upsert(account: account)
-            self.save(context: self.backgroundContext)
+            if self.backgroundContext.hasChanges {
+                try! self.backgroundContext.save()
+            }
             completion?(accountMO)
             self.accountSubject.send(account.id)
         }
@@ -188,7 +180,9 @@ class MastodonCachePersistentStore: NSPersistentContainer {
     func addOrUpdate(relationship: Relationship, completion: ((RelationshipMO) -> Void)? = nil) {
         backgroundContext.perform {
             let relationshipMO = self.upsert(relationship: relationship)
-            self.save(context: self.backgroundContext)
+            if self.backgroundContext.hasChanges {
+                try! self.backgroundContext.save()
+            }
             completion?(relationshipMO)
             self.relationshipSubject.send(relationship.id)
         }
@@ -197,7 +191,9 @@ class MastodonCachePersistentStore: NSPersistentContainer {
     func addAll(accounts: [Account], completion: (() -> Void)? = nil) {
         backgroundContext.perform {
             accounts.forEach { self.upsert(account: $0) }
-            self.save(context: self.backgroundContext)
+            if self.backgroundContext.hasChanges {
+                try! self.backgroundContext.save()
+            }
             completion?()
             accounts.forEach { self.accountSubject.send($0.id) }
         }
@@ -211,7 +207,9 @@ class MastodonCachePersistentStore: NSPersistentContainer {
             let accounts = notifications.filter { $0.kind != .mention }.map { $0.account }
             statuses.forEach { self.upsert(status: $0, context: self.backgroundContext) }
             accounts.forEach { self.upsert(account: $0) }
-            self.save(context: self.backgroundContext)
+            if self.backgroundContext.hasChanges {
+                try! self.backgroundContext.save()
+            }
             completion?()
             statuses.forEach { self.statusSubject.send($0.id) }
             accounts.forEach { self.accountSubject.send($0.id) }
@@ -234,7 +232,9 @@ class MastodonCachePersistentStore: NSPersistentContainer {
             updatedAccounts.forEach(self.accountSubject.send)
             updatedStatuses.forEach(self.statusSubject.send)
             
-            self.save(context: self.backgroundContext)
+            if self.backgroundContext.hasChanges {
+                try! self.backgroundContext.save()
+            }
             completion?()
         }
     }

Tusker/Info.plist

@@ -4,7 +4,7 @@
 <dict>
 	<key>OSLogPreferences</key>
 	<dict>
-		<key>space.vaccor.Tusker</key>
+		<key>$(PRODUCT_BUNDLE_IDENTIFIER)</key>
 		<dict>
 			<key>DEFAULT-OPTIONS</key>
 			<dict>

Tusker/Screens/Timeline/HashtagTimelineViewController.swift

@@ -58,7 +58,7 @@ class HashtagTimelineViewController: TimelineTableViewController {
         } else {
             _ = SavedHashtag(hashtag: hashtag, context: context)
         }
-        mastodonController.persistentContainer.save(context: context)
+        try! context.save()
     }
 
 }

Tusker/Screens/Timeline/InstanceTimelineViewController.swift

@@ -94,7 +94,7 @@ class InstanceTimelineViewController: TimelineTableViewController {
             _ = SavedInstance(url: instanceURL, context: context)
             delegate?.didSaveInstance(url: instanceURL)
         }
-        mastodonController.persistentContainer.save(context: context)
+        try? context.save()
     }
 
 }

Tusker/Screens/Timeline/TimelineViewController.swift

@@ -124,7 +124,7 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
     private func applyInitialSnapshot() {
         if case .public(let local) = timeline,
            (local && !Preferences.shared.hasShownLocalTimelineDescription) ||
-            (!local && !Preferences.shared.hasShownFederatedTimelineDescription) {
+            (!local && Preferences.shared.hasShownFederatedTimelineDescription) {
             var snapshot = dataSource.snapshot()
             snapshot.appendSections([.header])
             snapshot.appendItems([.publicTimelineDescription], toSection: .header)
@@ -144,25 +144,6 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
         }
     }
     
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        
-        if isShowingTimelineDescription,
-           case .public(let local) = timeline {
-            if local {
-                Preferences.shared.hasShownLocalTimelineDescription = true
-            } else {
-                Preferences.shared.hasShownFederatedTimelineDescription = true
-            }
-        }
-    }
-    
-    override func viewDidDisappear(_ animated: Bool) {
-        super.viewDidDisappear(animated)
-        
-        pruneOffscreenRows()
-    }
-    
     private func removeTimelineDescriptionCell() {
         var snapshot = dataSource.snapshot()
         snapshot.deleteSections([.header])
@@ -170,25 +151,6 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
         isShowingTimelineDescription = false
     }
     
-    private func pruneOffscreenRows() {
-        guard let lastVisibleIndexPath = collectionView.indexPathsForVisibleItems.last else {
-            return
-        }
-        var snapshot = dataSource.snapshot()
-        let items = snapshot.itemIdentifiers(inSection: .statuses)
-        let pageSize = 20
-        let numberOfPagesToPrune = (items.count - lastVisibleIndexPath.row - 1) / pageSize
-        if numberOfPagesToPrune > 0 {
-            let itemsToRemove = Array(items.suffix(numberOfPagesToPrune * pageSize))
-            snapshot.deleteItems(itemsToRemove)
-        }
-        dataSource.apply(snapshot, animatingDifferences: false)
-        
-        if case .status(id: let id, state: _) = snapshot.itemIdentifiers(inSection: .statuses).last {
-            older = .before(id: id, count: nil)
-        }
-    }
-    
     @objc func refresh() {
         Task {
             await controller.loadNewer()

Tusker/Screens/Utilities/Previewing.swift

@@ -110,7 +110,7 @@ extension MenuActionProvider {
                     } else {
                         _ = SavedHashtag(hashtag: hashtag, context: context)
                     }
-                    mastodonController.persistentContainer.save(context: context)
+                    try! context.save()
                 })
             ]
         } else {

Tusker/Views/Attachments/AttachmentsContainerView.swift

@@ -33,17 +33,9 @@ class AttachmentsContainerView: UIView {
         }
     }
     
-    override init(frame: CGRect) {
+    override func awakeFromNib() {
-        super.init(frame: frame)
+        super.awakeFromNib()
-        commonInit()
-    }
         
-    required init?(coder: NSCoder) {
-        super.init(coder: coder)
-        commonInit()
-    }
-    
-    private func commonInit() {
         self.isUserInteractionEnabled = true
         self.layer.cornerRadius = 5
         self.layer.masksToBounds = true

Tusker/Views/Poll/StatusPollView.swift

@@ -170,7 +170,9 @@ class StatusPollView: UIView {
                         return
                     }
                     status.poll = poll
-                    container.save(context: container.viewContext)
+                    if container.viewContext.hasChanges {
+                        try! container.viewContext.save()
+                    }
                     container.statusSubject.send(status.id)
                 }
             }

Tusker/Views/Status/StatusCollectionViewCell.swift

@@ -85,12 +85,13 @@ extension StatusCollectionViewCell {
         
         contentContainer.contentTextView.setTextFrom(status: status)
         contentContainer.attachmentsView.delegate = self
-        contentContainer.attachmentsView.updateUI(status: status)
         contentContainer.cardView.updateUI(status: status)
         contentContainer.cardView.isHidden = status.card == nil
         contentContainer.cardView.navigationDelegate = delegate
         contentContainer.cardView.actionProvider = delegate
         
+        contentContainer.attachmentsView.updateUI(status: status)
+        
         updateStatusState(status: status)
         
         contentWarningLabel.text = status.spoilerText