Remove Status from CoreData

Mastodon.xcodeproj/project.pbxproj

@@ -60,6 +60,7 @@
 		2AE202AC297FE19100F66E55 /* FollowersCountIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE202AB297FE19100F66E55 /* FollowersCountIntentHandler.swift */; };
 		2AE202AD297FE1CD00F66E55 /* WidgetExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A72813E297EC762004138C5 /* WidgetExtension.swift */; };
 		2AE244482927831100BDBF7C /* UIImage+SFSymbols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE244472927831100BDBF7C /* UIImage+SFSymbols.swift */; };
+		2AF2E7BF2B19DC6E00D98917 /* FileManager+Timeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF2E7BE2B19DC6E00D98917 /* FileManager+Timeline.swift */; };
 		2D198643261BF09500F0B013 /* SearchResultItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D198642261BF09500F0B013 /* SearchResultItem.swift */; };
 		2D198649261C0B8500F0B013 /* SearchResultSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D198648261C0B8500F0B013 /* SearchResultSection.swift */; };
 		2D206B8625F5FB0900143C56 /* Double.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D206B8525F5FB0900143C56 /* Double.swift */; };
@@ -393,7 +394,6 @@
 		DB9282B225F3222800823B15 /* PickServerEmptyStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB9282B125F3222800823B15 /* PickServerEmptyStateView.swift */; };
 		DB938EE62623F50700E5B6C1 /* ThreadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB938EE52623F50700E5B6C1 /* ThreadViewController.swift */; };
 		DB938EED2623F79B00E5B6C1 /* ThreadViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB938EEC2623F79B00E5B6C1 /* ThreadViewModel.swift */; };
-		DB938F0326240EA300E5B6C1 /* CachedThreadViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB938F0226240EA300E5B6C1 /* CachedThreadViewModel.swift */; };
 		DB938F0926240F3C00E5B6C1 /* RemoteThreadViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB938F0826240F3C00E5B6C1 /* RemoteThreadViewModel.swift */; };
 		DB938F0F2624119800E5B6C1 /* ThreadViewModel+LoadThreadState.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB938F0E2624119800E5B6C1 /* ThreadViewModel+LoadThreadState.swift */; };
 		DB938F1F2624382F00E5B6C1 /* ThreadViewModel+Diffable.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB938F1E2624382F00E5B6C1 /* ThreadViewModel+Diffable.swift */; };
@@ -696,6 +696,7 @@
 		2AE202A9297FDDF500F66E55 /* WidgetExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WidgetExtension.entitlements; sourceTree = "<group>"; };
 		2AE202AB297FE19100F66E55 /* FollowersCountIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowersCountIntentHandler.swift; sourceTree = "<group>"; };
 		2AE244472927831100BDBF7C /* UIImage+SFSymbols.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+SFSymbols.swift"; sourceTree = "<group>"; };
+		2AF2E7BE2B19DC6E00D98917 /* FileManager+Timeline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FileManager+Timeline.swift"; sourceTree = "<group>"; };
 		2D198642261BF09500F0B013 /* SearchResultItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultItem.swift; sourceTree = "<group>"; };
 		2D198648261C0B8500F0B013 /* SearchResultSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultSection.swift; sourceTree = "<group>"; };
 		2D206B8525F5FB0900143C56 /* Double.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Double.swift; sourceTree = "<group>"; };
@@ -1115,7 +1116,6 @@
 		DB9282B125F3222800823B15 /* PickServerEmptyStateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PickServerEmptyStateView.swift; sourceTree = "<group>"; };
 		DB938EE52623F50700E5B6C1 /* ThreadViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadViewController.swift; sourceTree = "<group>"; };
 		DB938EEC2623F79B00E5B6C1 /* ThreadViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadViewModel.swift; sourceTree = "<group>"; };
-		DB938F0226240EA300E5B6C1 /* CachedThreadViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CachedThreadViewModel.swift; sourceTree = "<group>"; };
 		DB938F0826240F3C00E5B6C1 /* RemoteThreadViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteThreadViewModel.swift; sourceTree = "<group>"; };
 		DB938F0E2624119800E5B6C1 /* ThreadViewModel+LoadThreadState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ThreadViewModel+LoadThreadState.swift"; sourceTree = "<group>"; };
 		DB938F1E2624382F00E5B6C1 /* ThreadViewModel+Diffable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ThreadViewModel+Diffable.swift"; sourceTree = "<group>"; };
@@ -1898,6 +1898,7 @@
 			children = (
 				D8AC98772B0F62230045EC2B /* Model */,
 				D8AC98752B0F61680045EC2B /* FileManager+SearchHistory.swift */,
+				2AF2E7BE2B19DC6E00D98917 /* FileManager+Timeline.swift */,
 			);
 			path = Persistence;
 			sourceTree = "<group>";
@@ -2687,7 +2688,6 @@
 				DB938EEC2623F79B00E5B6C1 /* ThreadViewModel.swift */,
 				DB938F1E2624382F00E5B6C1 /* ThreadViewModel+Diffable.swift */,
 				DB938F0E2624119800E5B6C1 /* ThreadViewModel+LoadThreadState.swift */,
-				DB938F0226240EA300E5B6C1 /* CachedThreadViewModel.swift */,
 				DB938F0826240F3C00E5B6C1 /* RemoteThreadViewModel.swift */,
 				DB0FCB7F27968F70006C02E2 /* MastodonStatusThreadViewModel.swift */,
 			);
@@ -3909,7 +3909,6 @@
 				2AB5011C299243FB00346092 /* WidgetExtension.intentdefinition in Sources */,
 				DB9F58F126EF512300E7BBE9 /* AccountListTableViewCell.swift in Sources */,
 				2D76319F25C1521200929FB9 /* StatusSection.swift in Sources */,
-				DB938F0326240EA300E5B6C1 /* CachedThreadViewModel.swift in Sources */,
 				DBA5A53526F0A36A00CACBAA /* AddAccountTableViewCell.swift in Sources */,
 				2D35237A26256D920031AF25 /* NotificationSection.swift in Sources */,
 				DB98EB6927B21A7C0082E365 /* ReportResultActionTableViewCell.swift in Sources */,
@@ -3978,6 +3977,7 @@
 				DB9F58EC26EF435000E7BBE9 /* AccountViewController.swift in Sources */,
 				D8318A802A4466D300C0FB73 /* SettingsCoordinator.swift in Sources */,
 				DB3E6FF12806D96900B035AE /* DiscoveryNewsViewModel+Diffable.swift in Sources */,
+				2AF2E7BF2B19DC6E00D98917 /* FileManager+Timeline.swift in Sources */,
 				DB3E6FF82807C45300B035AE /* DiscoveryForYouViewModel.swift in Sources */,
 				DB0F9D56283EB46200379AF8 /* ProfileHeaderView+Configuration.swift in Sources */,
 				DB6746F0278F463B008A6B94 /* AutoGenerateProtocolDelegate.swift in Sources */,

Mastodon/Coordinator/SceneCoordinator.swift

@@ -569,7 +569,10 @@ public extension SceneCoordinator {
     @MainActor
     func showLoading(on viewController: UIViewController?) {
         guard let viewController else { return }
-
+
+        /// Don't add HUD twice
+        guard MBProgressHUD.forView(viewController.view) == nil else { return }
+
         MBProgressHUD.showAdded(to: viewController.view, animated: true)
     }
 
@@ -626,7 +629,10 @@ extension SceneCoordinator: SettingsCoordinatorDelegate {
                 try await self.appContext.authenticationService.signOutMastodonUser(
                     authenticationBox: authContext.mastodonAuthenticationBox
                 )
-
+                let userIdentifier = authContext.mastodonAuthenticationBox
+                FileManager.default.invalidateHomeTimelineCache(for: userIdentifier)
+                FileManager.default.invalidateNotificationsAll(for: userIdentifier)
+                FileManager.default.invalidateNotificationsMentions(for: userIdentifier)
                 self.setup()
             }
 

Mastodon/Diffable/Notification/NotificationItem.swift

@@ -7,10 +7,10 @@
 
 import CoreData
 import Foundation
-import CoreDataStack
+import MastodonSDK
 
 enum NotificationItem: Hashable {
-    case feed(record: ManagedObjectRecord<Feed>)
-    case feedLoader(record: ManagedObjectRecord<Feed>)
+    case feed(record: MastodonFeed)
+    case feedLoader(record: MastodonFeed)
     case bottomLoader
 }

Mastodon/Diffable/Notification/NotificationSection.swift

@@ -41,18 +41,15 @@ extension NotificationSection {
 
         return UITableViewDiffableDataSource(tableView: tableView) { tableView, indexPath, item -> UITableViewCell? in
             switch item {
-            case .feed(let record):
+            case .feed(let feed):
                 let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: NotificationTableViewCell.self), for: indexPath) as! NotificationTableViewCell
-                context.managedObjectContext.performAndWait {
-                    guard let feed = record.object(in: context.managedObjectContext) else { return }
-                    configure(
-                        context: context,
-                        tableView: tableView,
-                        cell: cell,
-                        viewModel: NotificationTableViewCell.ViewModel(value: .feed(feed)),
-                        configuration: configuration
-                    )
-                }
+                configure(
+                    context: context,
+                    tableView: tableView,
+                    cell: cell,
+                    viewModel: NotificationTableViewCell.ViewModel(value: .feed(feed)),
+                    configuration: configuration
+                )
                 return cell
             case .feedLoader:
                 let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: TimelineBottomLoaderTableViewCell.self), for: indexPath) as! TimelineBottomLoaderTableViewCell

Mastodon/Diffable/Report/ReportItem.swift

@@ -7,10 +7,11 @@
 
 import Foundation
 import CoreDataStack
+import MastodonSDK
 
 enum ReportItem: Hashable {
     case header(context: HeaderContext)
-    case status(record: ManagedObjectRecord<Status>)
+    case status(record: MastodonStatus)
     case comment(context: CommentContext)
     case result(record: ManagedObjectRecord<MastodonUser>)
     case bottomLoader

Mastodon/Diffable/Report/ReportSection.swift

@@ -45,18 +45,15 @@ extension ReportSection {
                 cell.primaryLabel.text = headerContext.primaryLabelText
                 cell.secondaryLabel.text = headerContext.secondaryLabelText
                 return cell
-            case .status(let record):
+            case .status(let status):
                 let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: ReportStatusTableViewCell.self), for: indexPath) as! ReportStatusTableViewCell
-                context.managedObjectContext.performAndWait {
-                    guard let status = record.object(in: context.managedObjectContext) else { return }
-                    configure(
-                        context: context,
-                        tableView: tableView,
-                        cell: cell,
-                        viewModel: .init(value: status),
-                        configuration: configuration
-                    )
-                }
+                configure(
+                    context: context,
+                    tableView: tableView,
+                    cell: cell,
+                    viewModel: .init(value: status),
+                    configuration: configuration
+                )
                 return cell
             case .comment(let commentContext):
                 let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: ReportCommentTableViewCell.self), for: indexPath) as! ReportCommentTableViewCell

Mastodon/Diffable/Status/StatusItem.swift

@@ -8,11 +8,12 @@
 import Foundation
 import CoreDataStack
 import MastodonUI
+import MastodonSDK
 
 enum StatusItem: Hashable {
-    case feed(record: ManagedObjectRecord<Feed>)
-    case feedLoader(record: ManagedObjectRecord<Feed>)
-    case status(record: ManagedObjectRecord<Status>)
+    case feed(record: MastodonFeed)
+    case feedLoader(record: MastodonFeed)
+    case status(record: MastodonStatus)
     case thread(Thread)
     case topLoader
     case bottomLoader
@@ -24,7 +25,7 @@ extension StatusItem {
         case reply(context: Context)
         case leaf(context: Context)
 
-        public var record: ManagedObjectRecord<Status> {
+        public var record: MastodonStatus {
             switch self {
             case .root(let threadContext),
                 .reply(let threadContext),
@@ -37,12 +38,12 @@ extension StatusItem {
 
 extension StatusItem.Thread {
     class Context: Hashable {
-        let status: ManagedObjectRecord<Status>
+        let status: MastodonStatus
         var displayUpperConversationLink: Bool
         var displayBottomConversationLink: Bool
 
         init(
-            status: ManagedObjectRecord<Status>,
+            status: MastodonStatus,
             displayUpperConversationLink: Bool = false,
             displayBottomConversationLink: Bool = false
         ) {

Mastodon/Diffable/Status/StatusSection.swift

@@ -44,42 +44,33 @@ extension StatusSection {
 
         return UITableViewDiffableDataSource(tableView: tableView) { tableView, indexPath, item -> UITableViewCell? in
             switch item {
-            case .feed(let record):
+            case .feed(let feed):
                 let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: StatusTableViewCell.self), for: indexPath) as! StatusTableViewCell
-                context.managedObjectContext.performAndWait {
-                    guard let feed = record.object(in: context.managedObjectContext) else { return }
-                    configure(
-                        context: context,
-                        tableView: tableView,
-                        cell: cell,
-                        viewModel: StatusTableViewCell.ViewModel(value: .feed(feed)),
-                        configuration: configuration
-                    )
-                }
+                configure(
+                    context: context,
+                    tableView: tableView,
+                    cell: cell,
+                    viewModel: StatusTableViewCell.ViewModel(value: .feed(feed)),
+                    configuration: configuration
+                )
                 return cell
-            case .feedLoader(let record):
+            case .feedLoader(let feed):
                 let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: TimelineMiddleLoaderTableViewCell.self), for: indexPath) as! TimelineMiddleLoaderTableViewCell
-                context.managedObjectContext.performAndWait {
-                    guard let feed = record.object(in: context.managedObjectContext) else { return }
-                    configure(
-                        cell: cell,
-                        feed: feed,
-                        configuration: configuration
-                    )
-                }
+                configure(
+                    cell: cell,
+                    feed: feed,
+                    configuration: configuration
+                )
                 return cell
-            case .status(let record):
+            case .status(let status):
                 let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: StatusTableViewCell.self), for: indexPath) as! StatusTableViewCell
-                context.managedObjectContext.performAndWait {
-                    guard let status = record.object(in: context.managedObjectContext) else { return }
-                    configure(
-                        context: context,
-                        tableView: tableView,
-                        cell: cell,
-                        viewModel: StatusTableViewCell.ViewModel(value: .status(status)),
-                        configuration: configuration
-                    )
-                }
+                configure(
+                    context: context,
+                    tableView: tableView,
+                    cell: cell,
+                    viewModel: StatusTableViewCell.ViewModel(value: .status(status)),
+                    configuration: configuration
+                )
                 return cell
             case .thread(let thread):
                 let cell = dequeueConfiguredReusableCell(
@@ -118,36 +109,28 @@ extension StatusSection {
         tableView: UITableView,
         indexPath: IndexPath,
         configuration: ThreadCellRegistrationConfiguration
-    ) -> UITableViewCell {
-        let managedObjectContext = context.managedObjectContext
-
+    ) -> UITableViewCell {        
         switch configuration.thread {
         case .root(let threadContext):
             let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: StatusThreadRootTableViewCell.self), for: indexPath) as! StatusThreadRootTableViewCell
-            managedObjectContext.performAndWait {
-                guard let status = threadContext.status.object(in: managedObjectContext) else { return }
-                StatusSection.configure(
-                    context: context,
-                    tableView: tableView,
-                    cell: cell,
-                    viewModel: StatusThreadRootTableViewCell.ViewModel(value: .status(status)),
-                    configuration: configuration.configuration
-                )
-            }
+            StatusSection.configure(
+                context: context,
+                tableView: tableView,
+                cell: cell,
+                viewModel: StatusThreadRootTableViewCell.ViewModel(value: .status(threadContext.status)),
+                configuration: configuration.configuration
+            )
             return cell
         case .reply(let threadContext),
              .leaf(let threadContext):
             let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: StatusTableViewCell.self), for: indexPath) as! StatusTableViewCell
-            managedObjectContext.performAndWait {
-                guard let status = threadContext.status.object(in: managedObjectContext) else { return }
-                StatusSection.configure(
-                    context: context,
-                    tableView: tableView,
-                    cell: cell,
-                    viewModel: StatusTableViewCell.ViewModel(value: .status(status)),
-                    configuration: configuration.configuration
-                )
-            }
+            StatusSection.configure(
+                context: context,
+                tableView: tableView,
+                cell: cell,
+                viewModel: StatusTableViewCell.ViewModel(value: .status(threadContext.status)),
+                configuration: configuration.configuration
+            )
             return cell
         }
     }
@@ -182,7 +165,7 @@ extension StatusSection {
                         return
                     }
 
-                    cell.pollOptionView.configure(pollOption: option)
+                    cell.pollOptionView.configure(pollOption: option, status: statusView.viewModel.originalStatus)
 
                     // trigger update if needs
                     let needsUpdatePoll: Bool = {
@@ -319,7 +302,7 @@ extension StatusSection {
 
     static func configure(
         cell: TimelineMiddleLoaderTableViewCell,
-        feed: Feed,
+        feed: MastodonFeed,
         configuration: Configuration
     ) {
         cell.configure(

Mastodon/Persistence/FileManager+SearchHistory.swift

@@ -68,8 +68,12 @@ extension FileManager {
     }
 }
 
-extension FileManager {
-    public var documentsDirectory: URL? {
-        return self.urls(for: .documentDirectory, in: .userDomainMask).first
+public extension FileManager {
+    var documentsDirectory: URL? {
+        urls(for: .documentDirectory, in: .userDomainMask).first
+    }
+
+    var cachesDirectory: URL? {
+        urls(for: .cachesDirectory, in: .userDomainMask).first
     }
 }