Add toast error messages to menu actions

Split MenuActionProvider from MenuPreviewProvider
Don't include Open in Tusker on Catalyst
2022-05-01 23:06:59 -04:00 · 2022-05-01 23:05:23 -04:00 · 2022-05-01 21:50:16 -04:00 · 2022-05-01 21:50:16 -04:00 · 2022-05-01 21:50:11 -04:00 · 2022-05-01 12:05:38 -04:00
42 changed files with 332 additions and 245 deletions
--- a/Pachyderm/Sources/Pachyderm/Model/Hashtag.swift
+++ b/Pachyderm/Sources/Pachyderm/Model/Hashtag.swift
@ -34,6 +34,13 @@ public class Hashtag: Codable {
        self.history = try container.decodeIfPresent([History].self, forKey: .history)
    }
    
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(name, forKey: .name)
+        try container.encode(url.absoluteString, forKey: .url)
+        try container.encodeIfPresent(history, forKey: .history)
+    }
+    
    private enum CodingKeys: String, CodingKey {
        case name
        case url
--- a/Tusker.xcodeproj/project.pbxproj
+++ b/Tusker.xcodeproj/project.pbxproj
@ -236,6 +236,7 @@
 		D6B81F442560390300F6E31D /* MenuController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B81F432560390300F6E31D /* MenuController.swift */; };
 		D6B8DB342182A59300424AF7 /* UIAlertController+Visibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B8DB332182A59300424AF7 /* UIAlertController+Visibility.swift */; };
 		D6B93667281D937300237D0E /* MainSidebarMyProfileCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B93666281D937300237D0E /* MainSidebarMyProfileCollectionViewCell.swift */; };
+		D6B9366B281EE77E00237D0E /* PollVoteButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B9366A281EE77E00237D0E /* PollVoteButton.swift */; };
 		D6BC8748219738E1006163F1 /* EnhancedTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC8747219738E1006163F1 /* EnhancedTableViewController.swift */; };
 		D6BC9DB1232C61BC002CA326 /* NotificationsPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DB0232C61BC002CA326 /* NotificationsPageViewController.swift */; };
 		D6BC9DB3232D4C07002CA326 /* WellnessPrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DB2232D4C07002CA326 /* WellnessPrefsView.swift */; };
@ -281,7 +282,7 @@
 		D6E343AB265AAD6B00C4AA01 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D6E343AA265AAD6B00C4AA01 /* Media.xcassets */; };
 		D6E343AD265AAD6B00C4AA01 /* ActionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E343AC265AAD6B00C4AA01 /* ActionViewController.swift */; };
 		D6E343B0265AAD6B00C4AA01 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D6E343AE265AAD6B00C4AA01 /* MainInterface.storyboard */; };
-		D6E343B4265AAD6B00C4AA01 /* OpenInTusker.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = D6E343A8265AAD6B00C4AA01 /* OpenInTusker.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		D6E343B4265AAD6B00C4AA01 /* OpenInTusker.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = D6E343A8265AAD6B00C4AA01 /* OpenInTusker.appex */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		D6E343BA265AAD8C00C4AA01 /* Action.js in Resources */ = {isa = PBXBuildFile; fileRef = D6E343B9265AAD8C00C4AA01 /* Action.js */; };
 		D6E4267725327FB400C02E1C /* ComposeAutocompleteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E4267625327FB400C02E1C /* ComposeAutocompleteView.swift */; };
 		D6E4269D2532A3E100C02E1C /* FuzzyMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E4269C2532A3E100C02E1C /* FuzzyMatcher.swift */; };
@ -577,6 +578,7 @@
 		D6B81F432560390300F6E31D /* MenuController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuController.swift; sourceTree = "<group>"; };
 		D6B8DB332182A59300424AF7 /* UIAlertController+Visibility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Visibility.swift"; sourceTree = "<group>"; };
 		D6B93666281D937300237D0E /* MainSidebarMyProfileCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainSidebarMyProfileCollectionViewCell.swift; sourceTree = "<group>"; };
+		D6B9366A281EE77E00237D0E /* PollVoteButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollVoteButton.swift; sourceTree = "<group>"; };
 		D6BC8747219738E1006163F1 /* EnhancedTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnhancedTableViewController.swift; sourceTree = "<group>"; };
 		D6BC9DB0232C61BC002CA326 /* NotificationsPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsPageViewController.swift; sourceTree = "<group>"; };
 		D6BC9DB2232D4C07002CA326 /* WellnessPrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WellnessPrefsView.swift; sourceTree = "<group>"; };
@ -749,6 +751,7 @@
 				D6A00B1C26379FC900316AD4 /* PollOptionsView.swift */,
 				D623A5402635FB3C0095BD04 /* PollOptionView.swift */,
 				D623A542263634100095BD04 /* PollOptionCheckboxView.swift */,
+				D6B9366A281EE77E00237D0E /* PollVoteButton.swift */,
 			);
 			path = Poll;
 			sourceTree = "<group>";
@ -1930,6 +1933,7 @@
 				D68232F72464F4FD00325FB8 /* ComposeDrawingViewController.swift in Sources */,
 				04586B4122B2FFB10021BD04 /* PreferencesView.swift in Sources */,
 				D6620ACE2511A0ED00312CA0 /* StatusStateResolver.swift in Sources */,
+				D6B9366B281EE77E00237D0E /* PollVoteButton.swift in Sources */,
 				D6BC9DB5232D4CE3002CA326 /* NotificationsMode.swift in Sources */,
 				D68015402401A6BA00D6103B /* ComposingPrefsView.swift in Sources */,
 				D67895BC24671E6D00D4CD9E /* PKDrawing+Render.swift in Sources */,
@ -2018,6 +2022,7 @@
 		};
 		D6E343B3265AAD6B00C4AA01 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
+			platformFilter = ios;
 			target = D6E343A7265AAD6B00C4AA01 /* OpenInTusker */;
 			targetProxy = D6E343B2265AAD6B00C4AA01 /* PBXContainerItemProxy */;
 		};
--- a/Activities/BookmarkStatusActivity.swift
+++ b/Activities/BookmarkStatusActivity.swift
@ -29,7 +29,7 @@ class BookmarkStatusActivity: StatusActivity {
        let request = Status.bookmark(status.id)
        mastodonController.run(request) { (response) in
            if case let .success(status, _) = response {
-                self.mastodonController.persistentContainer.addOrUpdate(status: status, incrementReferenceCount: false)
+                self.mastodonController.persistentContainer.addOrUpdate(status: status)
            } else {
                // todo: display error message
                UINotificationFeedbackGenerator().notificationOccurred(.error)
--- a/Activities/MuteConversationActivity.swift
+++ b/Activities/MuteConversationActivity.swift
@ -28,7 +28,7 @@ class MuteConversationActivity: StatusActivity {
        let request = Status.muteConversation(status.id)
        mastodonController.run(request) { (response) in
            if case let .success(status, _) = response {
-                self.mastodonController.persistentContainer.addOrUpdate(status: status, incrementReferenceCount: false)
+                self.mastodonController.persistentContainer.addOrUpdate(status: status)
            } else {
                // todo: display error message
                UINotificationFeedbackGenerator().notificationOccurred(.error)
--- a/Activities/PinStatusActivity.swift
+++ b/Activities/PinStatusActivity.swift
@ -28,7 +28,7 @@ class PinStatusActivity: StatusActivity {
        let request = Status.pin(status.id)
        mastodonController.run(request) { (response) in
            if case let .success(status, _) = response {
-                self.mastodonController.persistentContainer.addOrUpdate(status: status, incrementReferenceCount: false)
+                self.mastodonController.persistentContainer.addOrUpdate(status: status)
            } else {
                // todo: display error message
                UINotificationFeedbackGenerator().notificationOccurred(.error)
--- a/Activities/UnbookmarkStatusActivity.swift
+++ b/Activities/UnbookmarkStatusActivity.swift
@ -29,7 +29,7 @@ class UnbookmarkStatusActivity: StatusActivity {
        let request = Status.unbookmark(status.id)
        mastodonController.run(request) { (response) in
            if case let .success(status, _) = response {
-                self.mastodonController.persistentContainer.addOrUpdate(status: status, incrementReferenceCount: false)
+                self.mastodonController.persistentContainer.addOrUpdate(status: status)
            } else {
                // todo: display error message
                UINotificationFeedbackGenerator().notificationOccurred(.error)
--- a/Activities/UnmuteConversationActivity.swift
+++ b/Activities/UnmuteConversationActivity.swift
@ -28,7 +28,7 @@ class UnmuteConversationActivity: StatusActivity {
        let request = Status.unmuteConversation(status.id)
        mastodonController.run(request) { (response) in
            if case let .success(status, _) = response {
-                self.mastodonController.persistentContainer.addOrUpdate(status: status, incrementReferenceCount: false)
+                self.mastodonController.persistentContainer.addOrUpdate(status: status)
            } else {
                // todo: display error message
                UINotificationFeedbackGenerator().notificationOccurred(.error)
--- a/Activities/UnpinStatusActivity.swift
+++ b/Activities/UnpinStatusActivity.swift
@ -28,7 +28,7 @@ class UnpinStatusActivity: StatusActivity {
        let request = Status.unpin(status.id)
        mastodonController.run(request) { (response) in
            if case let .success(status, _) = response {
-                self.mastodonController.persistentContainer.addOrUpdate(status: status, incrementReferenceCount: false)
+                self.mastodonController.persistentContainer.addOrUpdate(status: status)
            } else {
                // todo: display error message
                UINotificationFeedbackGenerator().notificationOccurred(.error)
--- a/Tusker/Controllers/MastodonController.swift
+++ b/Tusker/Controllers/MastodonController.swift
@ -137,7 +137,7 @@ class MastodonController: ObservableObject {
                        } else {
                            // the first time the user's account is added to the store,
                            // increment its reference count so that it's never removed
-                            self.persistentContainer.addOrUpdate(account: account, incrementReferenceCount: true)
+                            self.persistentContainer.addOrUpdate(account: account)
                        }
                        completion?(.success(account))
                    }
--- a/Tusker/CoreData/AccountMO.swift
+++ b/Tusker/CoreData/AccountMO.swift
@ -32,10 +32,10 @@ public final class AccountMO: NSManagedObject, AccountProtocol {
    @NSManaged public var locked: Bool
    @NSManaged public var movedCD: Bool
    @NSManaged public var note: String
-    @NSManaged public var referenceCount: Int
    @NSManaged public var statusesCount: Int
    @NSManaged public var url: URL
    @NSManaged public var username: String
+    @NSManaged public var lastFetchedAt: Date?
    @NSManaged public var movedTo: AccountMO?
    
    @LazilyDecoding(arrayFrom: \AccountMO.emojisData)
@ -47,21 +47,13 @@ public final class AccountMO: NSManagedObject, AccountProtocol {
    public var bot: Bool? { botCD }
    public var moved: Bool? { movedCD }
    
-    func incrementReferenceCount() {
-        referenceCount += 1
-    }
-    
-    func decrementReferenceCount() {
-        referenceCount -= 1
-        if referenceCount <= 0 {
-            managedObjectContext!.delete(self)
+    public override func awakeFromFetch() {
+        super.awakeFromFetch()
+        
+        managedObjectContext?.perform {
+            self.lastFetchedAt = Date()
        }
    }
-    
-    public override func prepareForDeletion() {
-        super.prepareForDeletion()
-        movedTo?.decrementReferenceCount()
-    }

 }

@ -69,8 +61,6 @@ extension AccountMO {
    convenience init(apiAccount account: Pachyderm.Account, container: MastodonCachePersistentStore, context: NSManagedObjectContext) {
        self.init(context: context)
        self.updateFrom(apiAccount: account, container: container)
-        
-        movedTo?.incrementReferenceCount()
    }
    
    func updateFrom(apiAccount account: Pachyderm.Account, container: MastodonCachePersistentStore) {
--- a/Tusker/CoreData/MastodonCachePersistentStore.swift
+++ b/Tusker/CoreData/MastodonCachePersistentStore.swift
@ -65,26 +65,19 @@ class MastodonCachePersistentStore: NSPersistentContainer {
    }
    
    @discardableResult
-    private func upsert(status: Status, incrementReferenceCount: Bool, context: NSManagedObjectContext) -> StatusMO {
+    private func upsert(status: Status, context: NSManagedObjectContext) -> StatusMO {
        if let statusMO = self.status(for: status.id, in: context) {
            statusMO.updateFrom(apiStatus: status, container: self)
-            if incrementReferenceCount {
-                statusMO.incrementReferenceCount()
-            }
            return statusMO
        } else {
-            let statusMO = StatusMO(apiStatus: status, container: self, context: context)
-            if incrementReferenceCount {
-                statusMO.incrementReferenceCount()
-            }
-            return statusMO
+            return StatusMO(apiStatus: status, container: self, context: context)
        }
    }
    
-    func addOrUpdate(status: Status, incrementReferenceCount: Bool, context: NSManagedObjectContext? = nil, completion: ((StatusMO) -> Void)? = nil) {
+    func addOrUpdate(status: Status, context: NSManagedObjectContext? = nil, completion: ((StatusMO) -> Void)? = nil) {
        let context = context ?? backgroundContext
        context.perform {
-            let statusMO = self.upsert(status: status, incrementReferenceCount: incrementReferenceCount, context: context)
+            let statusMO = self.upsert(status: status, context: context)
            if context.hasChanges {
                try! context.save()
            }
@ -95,7 +88,7 @@ class MastodonCachePersistentStore: NSPersistentContainer {

    func addAll(statuses: [Status], completion: (() -> Void)? = nil) {
        backgroundContext.perform {
-            statuses.forEach { self.upsert(status: $0, incrementReferenceCount: true, context: self.backgroundContext) }
+            statuses.forEach { self.upsert(status: $0, context: self.backgroundContext) }
            if self.backgroundContext.hasChanges {
                try! self.backgroundContext.save()
            }
@ -117,25 +110,18 @@ class MastodonCachePersistentStore: NSPersistentContainer {
    }
    
    @discardableResult
-    private func upsert(account: Account, incrementReferenceCount: Bool) -> AccountMO {
+    private func upsert(account: Account) -> AccountMO {
        if let accountMO = self.account(for: account.id, in: self.backgroundContext) {
            accountMO.updateFrom(apiAccount: account, container: self)
-            if incrementReferenceCount {
-                accountMO.incrementReferenceCount()
-            }
            return accountMO
        } else {
-            let accountMO = AccountMO(apiAccount: account, container: self, context: self.backgroundContext)
-            if incrementReferenceCount {
-                accountMO.incrementReferenceCount()
-            }
-            return accountMO
+            return AccountMO(apiAccount: account, container: self, context: self.backgroundContext)
        }
    }
    
-    func addOrUpdate(account: Account, incrementReferenceCount: Bool, completion: ((AccountMO) -> Void)? = nil) {
+    func addOrUpdate(account: Account, completion: ((AccountMO) -> Void)? = nil) {
        backgroundContext.perform {
-            let accountMO = self.upsert(account: account, incrementReferenceCount: incrementReferenceCount)
+            let accountMO = self.upsert(account: account)
            if self.backgroundContext.hasChanges {
                try! self.backgroundContext.save()
            }
@ -180,7 +166,7 @@ class MastodonCachePersistentStore: NSPersistentContainer {
    
    func addAll(accounts: [Account], completion: (() -> Void)? = nil) {
        backgroundContext.perform {
-            accounts.forEach { self.upsert(account: $0, incrementReferenceCount: true) }
+            accounts.forEach { self.upsert(account: $0) }
            if self.backgroundContext.hasChanges {
                try! self.backgroundContext.save()
            }
@ -195,8 +181,8 @@ class MastodonCachePersistentStore: NSPersistentContainer {
            // filter out mentions, otherwise we would double increment the reference count of those accounts
            // since the status has the same account as the notification
            let accounts = notifications.filter { $0.kind != .mention }.map { $0.account }
-            statuses.forEach { self.upsert(status: $0, incrementReferenceCount: true, context: self.backgroundContext) }
-            accounts.forEach { self.upsert(account: $0, incrementReferenceCount: true) }
+            statuses.forEach { self.upsert(status: $0, context: self.backgroundContext) }
+            accounts.forEach { self.upsert(account: $0) }
            if self.backgroundContext.hasChanges {
                try! self.backgroundContext.save()
            }
@ -212,10 +198,10 @@ class MastodonCachePersistentStore: NSPersistentContainer {
            var updatedStatuses = [String]()
            
            block(self.backgroundContext, { (accounts) in
-                accounts.forEach { self.upsert(account: $0, incrementReferenceCount: true) }
+                accounts.forEach { self.upsert(account: $0) }
                updatedAccounts.append(contentsOf: accounts.map { $0.id })
            }, { (statuses) in
-                statuses.forEach { self.upsert(status: $0, incrementReferenceCount: true, context: self.backgroundContext) }
+                statuses.forEach { self.upsert(status: $0, context: self.backgroundContext) }
                updatedStatuses.append(contentsOf: statuses.map { $0.id })
            })

--- a/Tusker/CoreData/StatusMO.swift
+++ b/Tusker/CoreData/StatusMO.swift
@ -36,7 +36,6 @@ public final class StatusMO: NSManagedObject, StatusProtocol {
    @NSManaged private var pinnedInternal: Bool
    @NSManaged public var reblogged: Bool
    @NSManaged public var reblogsCount: Int
-    @NSManaged public var referenceCount: Int
    @NSManaged public var sensitive: Bool
    @NSManaged public var spoilerText: String
    @NSManaged public var uri: String // todo: are both uri and url necessary?
@ -46,6 +45,7 @@ public final class StatusMO: NSManagedObject, StatusProtocol {
    @NSManaged public var account: AccountMO
    @NSManaged public var reblog: StatusMO?
    @NSManaged public var localOnly: Bool
+    @NSManaged public var lastFetchedAt: Date?
    
    @LazilyDecoding(arrayFrom: \StatusMO.attachmentsData)
    public var attachments: [Attachment]
@ -77,32 +77,20 @@ public final class StatusMO: NSManagedObject, StatusProtocol {
        }
    }
    
-    func incrementReferenceCount() {
-        referenceCount += 1
-    }
-    
-    func decrementReferenceCount() {
-        referenceCount -= 1
-        if referenceCount <= 0 {
-            managedObjectContext!.delete(self)
+    public override func awakeFromFetch() {
+        super.awakeFromFetch()
+        
+        managedObjectContext?.perform {
+            self.lastFetchedAt = Date()
        }
    }
    
-    public override func prepareForDeletion() {
-        super.prepareForDeletion()
-        reblog?.decrementReferenceCount()
-        account.decrementReferenceCount()
-    }
-
 }

 extension StatusMO {
    convenience init(apiStatus status: Pachyderm.Status, container: MastodonCachePersistentStore, context: NSManagedObjectContext) {
        self.init(context: context)
        self.updateFrom(apiStatus: status, container: container)
-        
-        reblog?.incrementReferenceCount()
-        account.incrementReferenceCount()
    }
    
    func updateFrom(apiStatus status: Pachyderm.Status, container: MastodonCachePersistentStore) {
--- a/Tusker/CoreData/Tusker.xcdatamodeld/Tusker.xcdatamodel/contents
+++ b/Tusker/CoreData/Tusker.xcdatamodeld/Tusker.xcdatamodel/contents
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="19574" systemVersion="21D49" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="20086" systemVersion="21E230" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
    <entity name="Account" representedClassName="AccountMO" syncable="YES">
        <attribute name="acct" attributeType="String"/>
        <attribute name="avatar" optional="YES" attributeType="URI"/>
@ -12,10 +12,10 @@
        <attribute name="followingCount" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
        <attribute name="header" optional="YES" attributeType="URI"/>
        <attribute name="id" attributeType="String"/>
+        <attribute name="lastFetchedAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
        <attribute name="locked" attributeType="Boolean" usesScalarValueType="YES"/>
        <attribute name="movedCD" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
        <attribute name="note" attributeType="String"/>
-        <attribute name="referenceCount" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
        <attribute name="statusesCount" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
        <attribute name="url" attributeType="URI"/>
        <attribute name="username" attributeType="String"/>
@ -54,6 +54,7 @@
        <attribute name="id" attributeType="String"/>
        <attribute name="inReplyToAccountID" optional="YES" attributeType="String"/>
        <attribute name="inReplyToID" optional="YES" attributeType="String"/>
+        <attribute name="lastFetchedAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
        <attribute name="localOnly" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
        <attribute name="mentionsData" attributeType="Binary"/>
        <attribute name="muted" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
@ -61,7 +62,6 @@
        <attribute name="pollData" optional="YES" attributeType="Binary"/>
        <attribute name="reblogged" attributeType="Boolean" usesScalarValueType="YES"/>
        <attribute name="reblogsCount" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
-        <attribute name="referenceCount" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
        <attribute name="sensitive" attributeType="Boolean" usesScalarValueType="YES"/>
        <attribute name="spoilerText" attributeType="String"/>
        <attribute name="uri" attributeType="String"/>
@ -76,7 +76,7 @@
        </uniquenessConstraints>
    </entity>
    <elements>
-        <element name="Account" positionX="169.21875" positionY="78.9609375" width="128" height="329"/>
+        <element name="Account" positionX="169.21875" positionY="78.9609375" width="128" height="343"/>
        <element name="Relationship" positionX="63" positionY="135" width="128" height="208"/>
        <element name="Status" positionX="-63" positionY="-18" width="128" height="449"/>
    </elements>
--- a/Tusker/MainSceneDelegate.swift
+++ b/Tusker/MainSceneDelegate.swift
@ -10,6 +10,7 @@ import UIKit
 import Pachyderm
 import CrashReporter
 import MessageUI
+import CoreData

 class MainSceneDelegate: UIResponder, UIWindowSceneDelegate {
    
@ -120,7 +121,22 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate {
            rootVC.sceneDidEnterBackground()
        }
        
-        try? scene.session.mastodonController?.persistentContainer.viewContext.save()
+        if let context = scene.session.mastodonController?.persistentContainer.viewContext {
+            var minDate = Date()
+            minDate.addTimeInterval(-7 * 24 * 60 * 60)
+            
+            let statusReq: NSFetchRequest<NSFetchRequestResult> = StatusMO.fetchRequest()
+            statusReq.predicate = NSPredicate(format: "(lastFetchedAt = nil) OR (lastFetchedAt < %@)", minDate as NSDate)
+            let deleteStatusReq = NSBatchDeleteRequest(fetchRequest: statusReq)
+            _ = try? context.execute(deleteStatusReq)
+            
+            let accountReq: NSFetchRequest<NSFetchRequestResult> = AccountMO.fetchRequest()
+            accountReq.predicate = NSPredicate(format: "(lastFetchedAt = nil) OR (lastFetchedAt < %@)", minDate as NSDate)
+            let deleteAccountReq = NSBatchDeleteRequest(fetchRequest: accountReq)
+            _ = try? context.execute(deleteAccountReq)
+            
+            try? context.save()
+        }
    }
    
    private func handlePendingCrashReport(_ report: PLCrashReport, session: UISceneSession) {
--- a/List/AccountListTableViewController.swift
+++ b/List/AccountListTableViewController.swift
@ -67,3 +67,9 @@ class AccountListTableViewController: EnhancedTableViewController {
 extension AccountListTableViewController: TuskerNavigationDelegate {
    var apiController: MastodonController { mastodonController }
 }
+
+extension AccountListTableViewController: ToastableViewController {
+}
+
+extension AccountListTableViewController: MenuActionProvider {
+}
--- a/Tusker/Screens/Bookmarks/BookmarksTableViewController.swift
+++ b/Tusker/Screens/Bookmarks/BookmarksTableViewController.swift
@ -134,7 +134,7 @@ class BookmarksTableViewController: EnhancedTableViewController {
            let request = Status.unbookmark(status.id)
            self.mastodonController.run(request) { (response) in
                guard case let .success(newStatus, _) = response else { fatalError() }
-                self.mastodonController.persistentContainer.addOrUpdate(status: newStatus, incrementReferenceCount: false)
+                self.mastodonController.persistentContainer.addOrUpdate(status: newStatus)
                self.statuses.remove(at: indexPath.row)
            }
        }
@ -153,6 +153,15 @@ class BookmarksTableViewController: EnhancedTableViewController {
    
 }

+extension BookmarksTableViewController: TuskerNavigationDelegate {
+}
+
+extension BookmarksTableViewController: ToastableViewController {
+}
+
+extension BookmarksTableViewController: MenuActionProvider {
+}
+
 extension BookmarksTableViewController: StatusTableViewCellDelegate {
    var apiController: MastodonController { mastodonController }
    
--- a/Tusker/Screens/Conversation/ConversationTableViewController.swift
+++ b/Tusker/Screens/Conversation/ConversationTableViewController.swift
@ -52,14 +52,6 @@ class ConversationTableViewController: EnhancedTableViewController {
        fatalError("init(coder:) has not been implemented")
    }
    
-    deinit {
-        guard let persistentContainer = mastodonController?.persistentContainer else { return }
-        let snapshot = dataSource.snapshot()
-        for case let .status(id: id, state: _) in snapshot.itemIdentifiers {
-            persistentContainer.status(for: id)?.decrementReferenceCount()
-        }
-    }
-    
    override func viewDidLoad() {
        super.viewDidLoad()
        
@ -149,7 +141,7 @@ class ConversationTableViewController: EnhancedTableViewController {
                switch response {
                case let .success(status, _):
                    let viewContext = self.mastodonController.persistentContainer.viewContext
-                    self.mastodonController.persistentContainer.addOrUpdate(status: status, incrementReferenceCount: false, context: viewContext) { (statusMO) in
+                    self.mastodonController.persistentContainer.addOrUpdate(status: status, context: viewContext) { (statusMO) in
                        self.mainStatusLoaded(statusMO)
                    }
                    
@ -169,8 +161,6 @@ class ConversationTableViewController: EnhancedTableViewController {
    }
    
    private func mainStatusLoaded(_ mainStatus: StatusMO) {
-        mainStatus.incrementReferenceCount()
-        
        let mainStatusItem = Item.status(id: mainStatusID, state: mainStatusState)
        
        var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
@ -454,6 +444,9 @@ extension ConversationTableViewController: TuskerNavigationDelegate {
    }
 }

+extension ConversationTableViewController: MenuActionProvider {
+}
+
 extension ConversationTableViewController: StatusTableViewCellDelegate {
    var apiController: MastodonController { mastodonController }
    func statusCellCollapsedStateChanged(_ cell: BaseStatusTableViewCell) {
--- a/Tusker/Screens/Explore/ProfileDirectoryViewController.swift
+++ b/Tusker/Screens/Explore/ProfileDirectoryViewController.swift
@ -134,8 +134,10 @@ extension ProfileDirectoryViewController: TuskerNavigationDelegate {
    var apiController: MastodonController { mastodonController }
 }

-extension ProfileDirectoryViewController: MenuPreviewProvider {
-    var navigationDelegate: TuskerNavigationDelegate? { self }
+extension ProfileDirectoryViewController: ToastableViewController {
+}
+
+extension ProfileDirectoryViewController: MenuActionProvider {
 }

 extension ProfileDirectoryViewController: UICollectionViewDelegate {
--- a/Tusker/Screens/Explore/TrendingHashtagsViewController.swift
+++ b/Tusker/Screens/Explore/TrendingHashtagsViewController.swift
@ -110,6 +110,8 @@ extension TrendingHashtagsViewController: TuskerNavigationDelegate {
    var apiController: MastodonController { mastodonController }
 }

-extension TrendingHashtagsViewController: MenuPreviewProvider {
-    var navigationDelegate: TuskerNavigationDelegate? { self }
+extension TrendingHashtagsViewController: ToastableViewController {
+}
+
+extension TrendingHashtagsViewController: MenuActionProvider {
 }
--- a/Tusker/Screens/Explore/TrendingLinksViewController.swift
+++ b/Tusker/Screens/Explore/TrendingLinksViewController.swift
@ -104,6 +104,8 @@ extension TrendingLinksViewController: TuskerNavigationDelegate {
    var apiController: MastodonController { mastodonController }
 }

-extension TrendingLinksViewController: MenuPreviewProvider {
-    var navigationDelegate: TuskerNavigationDelegate? { self }
+extension TrendingLinksViewController: ToastableViewController {
+}
+
+extension TrendingLinksViewController: MenuActionProvider {
 }
--- a/Tusker/Screens/Explore/TrendingStatusesViewController.swift
+++ b/Tusker/Screens/Explore/TrendingStatusesViewController.swift
@ -85,6 +85,12 @@ extension TrendingStatusesViewController: TuskerNavigationDelegate {
    var apiController: MastodonController { mastodonController }
 }

+extension TrendingStatusesViewController: ToastableViewController {
+}
+
+extension TrendingStatusesViewController: MenuActionProvider {
+}
+
 extension TrendingStatusesViewController: StatusTableViewCellDelegate {
    func statusCellCollapsedStateChanged(_ cell: BaseStatusTableViewCell) {
        tableView.beginUpdates()
--- a/Tusker/Screens/Lists/EditListAccountsViewController.swift
+++ b/Tusker/Screens/Lists/EditListAccountsViewController.swift
@ -176,3 +176,9 @@ extension EditListAccountsViewController: SearchResultsViewControllerDelegate {
 extension EditListAccountsViewController: TuskerNavigationDelegate {
    var apiController: MastodonController { mastodonController }
 }
+
+extension EditListAccountsViewController: ToastableViewController {
+}
+
+extension EditListAccountsViewController: MenuActionProvider {
+}
--- a/Tusker/Screens/Notifications/NotificationsTableViewController.swift
+++ b/Tusker/Screens/Notifications/NotificationsTableViewController.swift
@ -250,6 +250,9 @@ extension NotificationsTableViewController: TuskerNavigationDelegate {
    var apiController: MastodonController { mastodonController }
 }

+extension NotificationsTableViewController: MenuActionProvider {
+}
+
 extension NotificationsTableViewController: StatusTableViewCellDelegate {
    func statusCellCollapsedStateChanged(_ cell: BaseStatusTableViewCell) {
        cellHeightChanged()
--- a/Tusker/Screens/Profile/ProfileViewController.swift
+++ b/Tusker/Screens/Profile/ProfileViewController.swift
@ -56,12 +56,6 @@ class ProfileViewController: UIPageViewController {
    required init?(coder: NSCoder) {
        fatalError("init(coder:) has not been implemented")
    }
-    
-    deinit {
-        if let accountID = accountID {
-            mastodonController.persistentContainer.account(for: accountID)?.decrementReferenceCount()
-        }
-    }

    override func viewDidLoad() {
        super.viewDidLoad()
@ -122,7 +116,7 @@ class ProfileViewController: UIPageViewController {
                guard let self = self else { return }
                switch response {
                case .success(let account, _):
-                    self.mastodonController.persistentContainer.addOrUpdate(account: account, incrementReferenceCount: true) { (account) in
+                    self.mastodonController.persistentContainer.addOrUpdate(account: account) { (account) in
                        DispatchQueue.main.async {
                            self.updateAccountUI()
                        }
--- a/Tusker/Screens/Search/SearchResultsViewController.swift
+++ b/Tusker/Screens/Search/SearchResultsViewController.swift
@ -172,24 +172,9 @@ class SearchResultsViewController: EnhancedTableViewController {
    }
    
    private func showSearchResults(_ results: SearchResults) {
-        let oldSnapshot = self.dataSource.snapshot()
        var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
        
        self.mastodonController.persistentContainer.performBatchUpdates({ (context, addAccounts, addStatuses) in
-            if oldSnapshot.indexOfSection(.accounts) != nil {
-                oldSnapshot.itemIdentifiers(inSection: .accounts).forEach { (item) in
-                    guard case let .account(id) = item else { return }
-                    self.mastodonController.persistentContainer.account(for: id, in: context)?.decrementReferenceCount()
-                }
-            }
-            
-            if oldSnapshot.indexOfSection(.statuses) != nil {
-                oldSnapshot.itemIdentifiers(inSection: .statuses).forEach { (item) in
-                    guard case let .status(id, _) = item else { return }
-                    self.mastodonController.persistentContainer.status(for: id, in: context)?.decrementReferenceCount()
-                }
-            }
-            
            let resultTypes = self.resultTypes
            if !results.accounts.isEmpty && (resultTypes == nil || resultTypes!.contains(.accounts)) {
                snapshot.appendSections([.accounts])
@ -303,6 +288,15 @@ extension SearchResultsViewController: UISearchBarDelegate {
    }
 }

+extension SearchResultsViewController: TuskerNavigationDelegate {
+}
+
+extension SearchResultsViewController: ToastableViewController {
+}
+
+extension SearchResultsViewController: MenuActionProvider {
+}
+
 extension SearchResultsViewController: StatusTableViewCellDelegate {
    var apiController: MastodonController { mastodonController }
    func statusCellCollapsedStateChanged(_ cell: BaseStatusTableViewCell) {
--- a/List/StatusActionAccountListTableViewController.swift
+++ b/List/StatusActionAccountListTableViewController.swift
@ -60,16 +60,6 @@ class StatusActionAccountListTableViewController: EnhancedTableViewController {
        fatalError("init(coder:) has not been implemented")
    }
    
-    deinit {
-        if let accountIDs = self.accountIDs, let container = mastodonController?.persistentContainer {
-            container.backgroundContext.perform {
-                for id in accountIDs {
-                    container.account(for: id, in: container.backgroundContext)?.decrementReferenceCount()
-                }
-            }
-        }
-    }
-    
    override func viewDidLoad() {
        super.viewDidLoad()

@ -83,11 +73,7 @@ class StatusActionAccountListTableViewController: EnhancedTableViewController {
        
        tableView.tableHeaderView = UIView(frame: CGRect(x: 0, y: 0, width: 0, height: CGFloat.leastNormalMagnitude))
        
-        if let accountIDs = accountIDs {
-            accountIDs.forEach { (id) in
-                self.mastodonController.persistentContainer.account(for: id)?.incrementReferenceCount()
-            }
-        } else {
+        if accountIDs == nil {
            // account IDs haven't been set, so perform a request to load them
            guard let status = mastodonController.persistentContainer.status(for: statusID) else {
                fatalError("Missing cached status \(statusID)")
@ -158,6 +144,15 @@ class StatusActionAccountListTableViewController: EnhancedTableViewController {
    
 }

+extension StatusActionAccountListTableViewController: TuskerNavigationDelegate {
+}
+
+extension StatusActionAccountListTableViewController: ToastableViewController {
+}
+
+extension StatusActionAccountListTableViewController: MenuActionProvider {
+}
+
 extension StatusActionAccountListTableViewController: StatusTableViewCellDelegate {
    var apiController: MastodonController { mastodonController }
    func statusCellCollapsedStateChanged(_ cell: BaseStatusTableViewCell) {
--- a/Tusker/Screens/Timeline/TimelineTableViewController.swift
+++ b/Tusker/Screens/Timeline/TimelineTableViewController.swift
@ -42,18 +42,6 @@ class TimelineTableViewController: DiffableTimelineLikeTableViewController<Timel
        fatalError("init(coder:) has not been implemented")
    }
    
-    deinit {
-        guard let persistentContainer = mastodonController?.persistentContainer,
-              let dataSource = dataSource else { return }
-        // decrement reference counts of any statuses we still have
-        // if the app is currently being quit, this will not affect the persisted data because
-        // the persistent container would already have been saved in SceneDelegate.sceneDidEnterBackground(_:)
-        // todo: remove the whole reference count system
-        for case let .status(id: id, state: _) in dataSource.snapshot().itemIdentifiers {
-            persistentContainer.status(for: id)?.decrementReferenceCount()
-        }
-    }
-    
    override func viewDidLoad() {
        super.viewDidLoad()
        
@ -245,12 +233,6 @@ class TimelineTableViewController: DiffableTimelineLikeTableViewController<Timel
        }
    }
    
-    override func willRemoveItems(_ items: [Item]) {
-        for case let .status(id: id, state: _) in items {
-            mastodonController.persistentContainer.status(for: id)?.decrementReferenceCount()
-        }
-    }
-    
    override func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
        super.scrollViewWillBeginDragging(scrollView)
        
@ -312,6 +294,9 @@ extension TimelineTableViewController: StatusTableViewCellDelegate {
    }
 }

+extension TimelineTableViewController: MenuActionProvider {
+}
+
 extension TimelineTableViewController: UITableViewDataSourcePrefetching, StatusTablePrefetching {
    func tableView(_ tableView: UITableView, prefetchRowsAt indexPaths: [IndexPath]) {
        let ids: [String] = indexPaths.compactMap {
--- a/Tusker/Screens/Utilities/Previewing.swift
+++ b/Tusker/Screens/Utilities/Previewing.swift
@ -10,29 +10,33 @@ import UIKit
 import SafariServices
 import Pachyderm

+protocol MenuActionProvider: AnyObject {
+    var navigationDelegate: TuskerNavigationDelegate? { get }
+    var toastableViewController: ToastableViewController? { get }
+}
+
 protocol MenuPreviewProvider: AnyObject {
-    
    typealias PreviewProviders = (content: UIContextMenuContentPreviewProvider, actions: () -> [UIMenuElement])
    
-    var navigationDelegate: TuskerNavigationDelegate? { get }
-    
    func getPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> PreviewProviders?
-    
 }

 protocol CustomPreviewPresenting {
    func presentFromPreview(presenter: UIViewController)
 }

-extension MenuPreviewProvider {
+extension MenuActionProvider where Self: TuskerNavigationDelegate {
+    var navigationDelegate: TuskerNavigationDelegate? { self }
+}
+
+extension MenuActionProvider where Self: ToastableViewController {
+    var toastableViewController: ToastableViewController? { self }
+}
+
+extension MenuActionProvider {
    
    private var mastodonController: MastodonController? { navigationDelegate?.apiController }
    
-    // Default no-op implementation
-    func getPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> PreviewProviders? {
-        return nil
-    }
-    
    func actionsForProfile(accountID: String, sourceView: UIView?) -> [UIMenuElement] {
        guard let mastodonController = mastodonController,
            let account = mastodonController.persistentContainer.account(for: accountID) else { return [] }
@ -84,7 +88,7 @@ extension MenuPreviewProvider {
    
    func actionsForURL(_ url: URL, sourceView: UIView?) -> [UIAction] {
        return [
-           openInSafariAction(url: url),
+            openInSafariAction(url: url),
            createAction(identifier: "share", title: "Share", systemImageName: "square.and.arrow.up", handler: { [weak self, weak sourceView] (_) in
                guard let self = self else { return }
                self.navigationDelegate?.showMoreOptions(forURL: url, sourceView: sourceView)
@ -135,8 +139,15 @@ extension MenuPreviewProvider {
                guard let self = self else { return }
                let request = (bookmarked ? Status.unbookmark : Status.bookmark)(status.id)
                self.mastodonController?.run(request) { (response) in
-                    if case let .success(status, _) = response {
-                        self.mastodonController?.persistentContainer.addOrUpdate(status: status, incrementReferenceCount: false)
+                    switch response {
+                    case .success(let status, _):
+                        self.mastodonController?.persistentContainer.addOrUpdate(status: status)
+                        
+                    case .failure(let error):
+                        if let toastable = self.toastableViewController {
+                            let config = ToastConfiguration(from: error, with: "Error \(bookmarked ? "Unb" : "B")ookmarking", in: toastable, retryAction: nil)
+                            toastable.showToast(configuration: config, animated: true)
+                        }
                    }
                }
            }),
@ -157,8 +168,14 @@ extension MenuPreviewProvider {
                    guard let self = self else { return }
                    let request = (muted ? Status.unmuteConversation : Status.muteConversation)(status.id)
                    self.mastodonController?.run(request) { (response) in
-                        if case let .success(status, _) = response {
-                            self.mastodonController?.persistentContainer.addOrUpdate(status: status, incrementReferenceCount: false)
+                        switch response {
+                        case .success(let status, _):
+                            self.mastodonController?.persistentContainer.addOrUpdate(status: status)
+                        case .failure(let error):
+                            if let toastable = self.toastableViewController {
+                                let config = ToastConfiguration(from: error, with: "Error \(muted ? "Unm" : "M")uting", in: toastable, retryAction: nil)
+                                toastable.showToast(configuration: config, animated: true)
+                            }
                        }
                    }
                }))
@ -173,8 +190,14 @@ extension MenuPreviewProvider {
                    let request = (pinned ? Status.unpin : Status.pin)(status.id)
                    self.mastodonController?.run(request, completion: { [weak self] (response) in
                        guard let self = self else { return }
-                        if case let .success(status, _) = response {
-                            self.mastodonController?.persistentContainer.addOrUpdate(status: status, incrementReferenceCount: false)
+                        switch response {
+                        case .success(let status, _):
+                            self.mastodonController?.persistentContainer.addOrUpdate(status: status)
+                        case .failure(let error):
+                            if let toastable = self.toastableViewController {
+                                let config = ToastConfiguration(from: error, with: "Error \(pinned ? "Unp" :"P")inning", in: toastable, retryAction: nil)
+                                toastable.showToast(configuration: config, animated: true)
+                            }
                        }
                    })
                }))
@ -186,10 +209,16 @@ extension MenuPreviewProvider {
                guard let mastodonController = self?.mastodonController else { return }
                let request = Client.getStatus(id: status.id)
                mastodonController.run(request, completion: { (response) in
-                    if case let .success(status, _) = response {
+                    switch response {
+                    case .success(let status, _):
                        // todo: this shouldn't really use the viewContext, but for some reason saving the
                        // backgroundContext with the new version of the status isn't updating the viewContext
-                        mastodonController.persistentContainer.addOrUpdate(status: status, incrementReferenceCount: false, context: mastodonController.persistentContainer.viewContext)
+                        mastodonController.persistentContainer.addOrUpdate(status: status, context: mastodonController.persistentContainer.viewContext)
+                    case .failure(let error):
+                        if let toastable = self?.toastableViewController {
+                            let config = ToastConfiguration(from: error, with: "Error Refreshing Poll", in: toastable, retryAction: nil)
+                            toastable.showToast(configuration: config, animated: true)
+                        }
                    }
                })
            }), at: 0)
@ -257,7 +286,7 @@ extension MenuPreviewProvider {
            actions.append(UIWindowScene.ActivationAction { (_) in
                return .init(userActivity: activity(), options: options, preview: nil)
            })
-        } else if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
+        } else if UIApplication.shared.supportsMultipleScenes {
            actions.append(createAction(identifier: "new_window", title: "Open in New Window", systemImageName: "rectangle.badge.plus", handler: { (_) in
                UIApplication.shared.requestSceneSessionActivation(nil, userActivity: activity(), options: nil, errorHandler: nil)
            }))
@ -279,8 +308,11 @@ extension MenuPreviewProvider {
            let request = (following ? Account.unfollow : Account.follow)(accountID)
            mastodonController.run(request) { response in
                switch response {
-                case .failure(_):
-                    fatalError()
+                case .failure(let error):
+                    if let toastable = self.toastableViewController {
+                        let config = ToastConfiguration(from: error, with: "Error \(following ? "Unf" : "F")ollowing", in: toastable, retryAction: nil)
+                        toastable.showToast(configuration: config, animated: true)
+                    }
                case .success(let relationship, _):
                    mastodonController.persistentContainer.addOrUpdate(relationship: relationship)
                }
--- a/Cell/AccountTableViewCell.swift
+++ b/Cell/AccountTableViewCell.swift
@ -11,7 +11,7 @@ import SwiftSoup

 class AccountTableViewCell: UITableViewCell {

-    weak var delegate: TuskerNavigationDelegate?
+    weak var delegate: (TuskerNavigationDelegate & MenuActionProvider)?
    var mastodonController: MastodonController! { delegate?.apiController }
    
    @IBOutlet weak var avatarImageView: UIImageView!
@ -98,13 +98,11 @@ extension AccountTableViewCell: SelectableTableViewCell {
 }

 extension AccountTableViewCell: MenuPreviewProvider {
-    var navigationDelegate: TuskerNavigationDelegate? { return delegate }
-    
    func getPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> PreviewProviders? {
        guard let mastodonController = mastodonController else { return nil }
        return (
 			content: { ProfileViewController(accountID: self.accountID, mastodonController: mastodonController) },
-			actions: { self.actionsForProfile(accountID: self.accountID, sourceView: self.avatarImageView) }
+            actions: { self.delegate?.actionsForProfile(accountID: self.accountID, sourceView: self.avatarImageView) ?? [] }
 		)
    }
 }
--- a/Tusker/Views/ContentTextView.swift
+++ b/Tusker/Views/ContentTextView.swift
@ -243,9 +243,10 @@ extension ContentTextView: UITextViewDelegate {
    }
 }

-extension ContentTextView: MenuPreviewProvider {
-    func getPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> PreviewProviders? {
-        fatalError("unimplemented")
+extension ContentTextView: MenuActionProvider {
+    var toastableViewController: ToastableViewController? {
+        // todo: pass this down through the text view
+        nil
    }
 }

--- a/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.swift
+++ b/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.swift
@ -12,7 +12,7 @@ import SwiftSoup

 class ActionNotificationGroupTableViewCell: UITableViewCell {

-    weak var delegate: TuskerNavigationDelegate?
+    weak var delegate: (TuskerNavigationDelegate & MenuActionProvider)?
    var mastodonController: MastodonController! { delegate?.apiController }
    
    @IBOutlet weak var actionImageView: UIImageView!
@ -244,8 +244,6 @@ extension ActionNotificationGroupTableViewCell: SelectableTableViewCell {
 }

 extension ActionNotificationGroupTableViewCell: MenuPreviewProvider {
-    var navigationDelegate: TuskerNavigationDelegate? { return delegate }
-    
    func getPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> PreviewProviders? {
        return (content: {
            let notifications = self.group.notifications
--- a/Tusker/Views/Notifications/FollowNotificationGroupTableViewCell.swift
+++ b/Tusker/Views/Notifications/FollowNotificationGroupTableViewCell.swift
@ -11,7 +11,7 @@ import Pachyderm

 class FollowNotificationGroupTableViewCell: UITableViewCell {

-    weak var delegate: TuskerNavigationDelegate?
+    weak var delegate: (TuskerNavigationDelegate & MenuActionProvider)?
    var mastodonController: MastodonController! { delegate?.apiController }
    
    @IBOutlet weak var avatarStackView: UIStackView!
@ -196,8 +196,6 @@ extension FollowNotificationGroupTableViewCell: SelectableTableViewCell {
 }

 extension FollowNotificationGroupTableViewCell: MenuPreviewProvider {
-    var navigationDelegate: TuskerNavigationDelegate? { return delegate }
-    
    func getPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> PreviewProviders? {
        guard let mastodonController = mastodonController else { return nil }
        let accountIDs = self.group.notifications.map { $0.account.id }
@ -209,7 +207,7 @@ extension FollowNotificationGroupTableViewCell: MenuPreviewProvider {
            }
        }, actions: {
            if accountIDs.count == 1 {
-                return self.actionsForProfile(accountID: accountIDs.first!, sourceView: self)
+                return self.delegate?.actionsForProfile(accountID: accountIDs.first!, sourceView: self) ?? []
            } else {
                return []
            }
--- a/Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.swift
+++ b/Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.swift
@ -11,7 +11,7 @@ import Pachyderm

 class FollowRequestNotificationTableViewCell: UITableViewCell {

-    weak var delegate: TuskerNavigationDelegate?
+    weak var delegate: (TuskerNavigationDelegate & MenuActionProvider)?
    var mastodonController: MastodonController! { delegate?.apiController }
    
    @IBOutlet weak var stackView: UIStackView!
@ -169,8 +169,6 @@ extension FollowRequestNotificationTableViewCell: SelectableTableViewCell {
 }

 extension FollowRequestNotificationTableViewCell: MenuPreviewProvider {
-    var navigationDelegate: TuskerNavigationDelegate? { return delegate }
-    
    func getPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> PreviewProviders? {
        guard let mastodonController = mastodonController else { return nil }
        return (content: {
--- a/Tusker/Views/Notifications/PollFinishedTableViewCell.swift
+++ b/Tusker/Views/Notifications/PollFinishedTableViewCell.swift
@ -12,7 +12,7 @@ import SwiftSoup

 class PollFinishedTableViewCell: UITableViewCell {
    
-    weak var delegate: TuskerNavigationDelegate?
+    weak var delegate: (TuskerNavigationDelegate & MenuActionProvider)?
    var mastodonController: MastodonController? { delegate?.apiController }
    
    @IBOutlet weak var displayNameLabel: EmojiLabel!
@ -91,8 +91,6 @@ extension PollFinishedTableViewCell: SelectableTableViewCell {
 }

 extension PollFinishedTableViewCell: MenuPreviewProvider {
-    var navigationDelegate: TuskerNavigationDelegate? { delegate }
-    
    func getPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> PreviewProviders? {
        guard let delegate = delegate,
              let statusID = notification?.status?.id,
@ -102,7 +100,7 @@ extension PollFinishedTableViewCell: MenuPreviewProvider {
        return (content: {
            delegate.conversation(mainStatusID: statusID, state: .unknown)
        }, actions: {
-            self.actionsForStatus(status, sourceView: self)
+            delegate.actionsForStatus(status, sourceView: self)
        })
    }
 }
--- a/Tusker/Views/Poll/PollVoteButton.swift
+++ b/Tusker/Views/Poll/PollVoteButton.swift
@ -0,0 +1,79 @@
+//
+//  PollVoteButton.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 5/1/22.
+//  Copyright © 2022 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+
+/// Wraps a UILabel and UIButton to allow setting disabled titles on Catalyst, where `setTitle(_:for:)` only works for the normal state.
+class PollVoteButton: UIView {
+
+    var disabledTitle: String = "" {
+        didSet {
+            update()
+        }
+    }
+    var isEnabled = true {
+        didSet {
+            update()
+        }
+    }
+    
+    private var button = UIButton(type: .system)
+    #if targetEnvironment(macCatalyst)
+    private var label = UILabel()
+    #endif
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        
+        button.translatesAutoresizingMaskIntoConstraints = false
+        button.setTitleColor(.secondaryLabel, for: .disabled)
+        embedSubview(button)
+        #if targetEnvironment(macCatalyst)
+        label.textColor = .secondaryLabel
+        label.translatesAutoresizingMaskIntoConstraints = false
+        embedSubview(label)
+        #endif
+        
+        update()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func addTarget(_ target: Any, action: Selector) {
+        button.addTarget(target, action: action, for: .touchUpInside)
+    }
+    
+    func setFont(_ font: UIFont) {
+        button.titleLabel!.font = font
+        #if targetEnvironment(macCatalyst)
+        label.font = font
+        #endif
+    }
+    
+    private func update() {
+        button.isEnabled = isEnabled
+        if isEnabled {
+            #if targetEnvironment(macCatalyst)
+            label.isHidden = true
+            button.isHidden = false
+            #endif
+            button.setTitle("Vote", for: .normal)
+        } else {
+            #if targetEnvironment(macCatalyst)
+            label.text = disabledTitle
+            label.isHidden = false
+            button.isHidden = true
+            #else
+            button.setTitle(disabledTitle, for: .disabled)
+            #endif
+        }
+    }
+
+}
--- a/Tusker/Views/Poll/StatusPollView.swift
+++ b/Tusker/Views/Poll/StatusPollView.swift
@ -26,7 +26,7 @@ class StatusPollView: UIView {
    private(set) var poll: Poll?
    
    private var optionsView: PollOptionsView!
-    private var voteButton: UIButton!
+    private var voteButton: PollVoteButton!
    private var infoLabel: UILabel!
    
    private var canVote = true
@ -54,12 +54,16 @@ class StatusPollView: UIView {
        infoLabel.adjustsFontSizeToFitWidth = true
        addSubview(infoLabel)
        
-        voteButton = UIButton(type: .system)
+//        voteButton = UIButton(type: .system)
+//        voteButton.translatesAutoresizingMaskIntoConstraints = false
+//        voteButton.addTarget(self, action: #selector(votePressed), for: .touchUpInside)
+//        voteButton.setTitle("Vote", for: .normal)
+//        voteButton.setTitleColor(.secondaryLabel, for: .disabled)
+//        voteButton.titleLabel!.font = infoLabel.font
+        voteButton = PollVoteButton()
        voteButton.translatesAutoresizingMaskIntoConstraints = false
-        voteButton.addTarget(self, action: #selector(votePressed), for: .touchUpInside)
-        voteButton.setTitle("Vote", for: .normal)
-        voteButton.setTitleColor(.secondaryLabel, for: .disabled)
-        voteButton.titleLabel!.font = infoLabel.font
+        voteButton.addTarget(self, action: #selector(votePressed))
+        voteButton.setFont(infoLabel.font)
        addSubview(voteButton)
        
        NSLayoutConstraint.activate([
@ -117,17 +121,17 @@ class StatusPollView: UIView {
        }
        
        if expired {
-            voteButton.setTitle("Expired", for: .disabled)
+            voteButton.disabledTitle = "Expired"
        } else if poll.voted ?? false {
            if status.account.id == mastodonController.account.id {
-                voteButton.setTitle("", for: .disabled)
+                voteButton.isHidden = true
            } else {
-                voteButton.setTitle("Voted", for: .disabled)
+                voteButton.disabledTitle = "Voted"
            }
        } else if poll.multiple {
-            voteButton.setTitle("Select multiple", for: .disabled)
+            voteButton.disabledTitle = "Select multiple"
        } else {
-            voteButton.setTitle("Select one", for: .disabled)
+            voteButton.disabledTitle = "Select one"
        }
        voteButton.isEnabled = false
    }
@ -139,7 +143,7 @@ class StatusPollView: UIView {
    @objc private func votePressed() {
        optionsView.isEnabled = false
        voteButton.isEnabled = false
-        voteButton.setTitle("Voted", for: .disabled)
+        voteButton.disabledTitle = "Voted"
        
        UIImpactFeedbackGenerator(style: .medium).impactOccurred()
        
--- a/Header/ProfileHeaderView.swift
+++ b/Header/ProfileHeaderView.swift
@ -10,7 +10,7 @@ import UIKit
 import Pachyderm
 import Combine

-protocol ProfileHeaderViewDelegate: TuskerNavigationDelegate {
+protocol ProfileHeaderViewDelegate: TuskerNavigationDelegate, MenuActionProvider {
    func profileHeader(_ headerView: ProfileHeaderView, selectedPostsIndexChangedTo newIndex: Int)
 }

@ -106,7 +106,7 @@ class ProfileHeaderView: UIView {
        
        updateImages(account: account)
        
-        moreButton.menu = UIMenu(title: "", image: nil, identifier: nil, options: [], children: actionsForProfile(accountID: accountID, sourceView: moreButton))
+        moreButton.menu = UIMenu(title: "", image: nil, identifier: nil, options: [], children: delegate?.actionsForProfile(accountID: accountID, sourceView: moreButton) ?? [])
        
        noteTextView.navigationDelegate = delegate
        noteTextView.setTextFromHtml(account.note)
@ -272,7 +272,3 @@ extension ProfileHeaderView: UIPointerInteractionDelegate {
        return UIPointerStyle(effect: .lift(preview), shape: .none)
    }
 }
-
-extension ProfileHeaderView: MenuPreviewProvider {
-    var navigationDelegate: TuskerNavigationDelegate? { delegate }
-}
--- a/Tusker/Views/Status/BaseStatusTableViewCell.swift
+++ b/Tusker/Views/Status/BaseStatusTableViewCell.swift
@ -11,11 +11,11 @@ import Pachyderm
 import Combine
 import AVKit

-protocol StatusTableViewCellDelegate: TuskerNavigationDelegate {
+protocol StatusTableViewCellDelegate: TuskerNavigationDelegate, MenuActionProvider {
    func statusCellCollapsedStateChanged(_ cell: BaseStatusTableViewCell)
 }

-class BaseStatusTableViewCell: UITableViewCell, MenuPreviewProvider {
+class BaseStatusTableViewCell: UITableViewCell {
    
    weak var delegate: StatusTableViewCellDelegate? {
        didSet {
@ -153,7 +153,8 @@ class BaseStatusTableViewCell: UITableViewCell, MenuPreviewProvider {
        
        cardView.card = status.card
        cardView.isHidden = status.card == nil
-        cardView.navigationDelegate = navigationDelegate
+        cardView.navigationDelegate = delegate
+        cardView.actionProvider = delegate
        
        attachmentsView.updateUI(status: status)
        
@ -206,7 +207,7 @@ class BaseStatusTableViewCell: UITableViewCell, MenuPreviewProvider {
        
        // keep menu in sync with changed states e.g. bookmarked, muted
        // do not include reply action here, because the cell already contains a button for it
-        moreButton.menu = UIMenu(title: "", image: nil, identifier: nil, options: [], children: actionsForStatus(status, sourceView: moreButton, includeReply: false))
+        moreButton.menu = UIMenu(title: "", image: nil, identifier: nil, options: [], children: delegate?.actionsForStatus(status, sourceView: moreButton, includeReply: false) ?? [])
        
        pollView.isHidden = status.poll == nil
        pollView.mastodonController = mastodonController
@ -326,13 +327,6 @@ class BaseStatusTableViewCell: UITableViewCell, MenuPreviewProvider {
        showStatusAutomatically = false
    }
    
-    // MARK: - MenuPreviewProvider
-    var navigationDelegate: TuskerNavigationDelegate? { return delegate }
-    
-    func getPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> PreviewProviders? {
-        return nil
-    }
-    
    // MARK: - Interaction

    @IBAction func collapseButtonPressed() {
@ -393,7 +387,7 @@ class BaseStatusTableViewCell: UITableViewCell, MenuPreviewProvider {
            DispatchQueue.main.async {
                if case let .success(newStatus, _) = response {
                    self.favorited = newStatus.favourited ?? false
-                    self.mastodonController.persistentContainer.addOrUpdate(status: newStatus, incrementReferenceCount: false)
+                    self.mastodonController.persistentContainer.addOrUpdate(status: newStatus)
                    UIImpactFeedbackGenerator(style: .light).impactOccurred()
                } else {
                    self.favorited = oldValue
@ -435,7 +429,7 @@ class BaseStatusTableViewCell: UITableViewCell, MenuPreviewProvider {
            DispatchQueue.main.async {
                if case let .success(newStatus, _) = response {
                    self.reblogged = newStatus.reblogged ?? false
-                    self.mastodonController.persistentContainer.addOrUpdate(status: newStatus, incrementReferenceCount: false)
+                    self.mastodonController.persistentContainer.addOrUpdate(status: newStatus)
                    UIImpactFeedbackGenerator(style: .light).impactOccurred()
                } else {
                    self.reblogged = oldValue
--- a/Tusker/Views/Status/ConversationMainStatusTableViewCell.swift
+++ b/Tusker/Views/Status/ConversationMainStatusTableViewCell.swift
@ -112,7 +112,7 @@ extension ConversationMainStatusTableViewCell: UIContextMenuInteractionDelegate
        return UIContextMenuConfiguration(identifier: nil) {
            ProfileViewController(accountID: self.accountID, mastodonController: self.mastodonController)
        } actionProvider: { (_) in
-            return UIMenu(title: "", image: nil, identifier: nil, options: [], children: self.actionsForProfile(accountID: self.accountID, sourceView: self.avatarImageView))
+            return UIMenu(title: "", image: nil, identifier: nil, options: [], children: self.delegate?.actionsForProfile(accountID: self.accountID, sourceView: self.avatarImageView) ?? [])
        }
    }
 }
--- a/Tusker/Views/Status/StatusCardView.swift
+++ b/Tusker/Views/Status/StatusCardView.swift
@ -14,6 +14,7 @@ import WebURLFoundationExtras
 class StatusCardView: UIView {
    
    weak var navigationDelegate: TuskerNavigationDelegate?
+    weak var actionProvider: MenuActionProvider?
    
    var card: Card? {
        didSet {
@ -212,9 +213,6 @@ class StatusCardView: UIView {

 }

-extension StatusCardView: MenuPreviewProvider {
-}
-
 extension StatusCardView: UIContextMenuInteractionDelegate {
    func contextMenuInteraction(_ interaction: UIContextMenuInteraction, configurationForMenuAtLocation location: CGPoint) -> UIContextMenuConfiguration? {
        guard let card = card else { return nil }
@ -222,7 +220,7 @@ extension StatusCardView: UIContextMenuInteractionDelegate {
        return UIContextMenuConfiguration(identifier: nil) {
            return SFSafariViewController(url: URL(card.url)!)
        } actionProvider: { (_) in
-            let actions = self.actionsForURL(URL(card.url)!, sourceView: self)
+            let actions = self.actionProvider?.actionsForURL(URL(card.url)!, sourceView: self) ?? []
            return UIMenu(title: "", image: nil, identifier: nil, options: [], children: actions)
        }
    }
--- a/Tusker/Views/Status/TimelineStatusTableViewCell.swift
+++ b/Tusker/Views/Status/TimelineStatusTableViewCell.swift
@ -214,17 +214,6 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
        reply()
    }

-    override func getPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> BaseStatusTableViewCell.PreviewProviders? {
-        guard let mastodonController = mastodonController,
-              let status = mastodonController.persistentContainer.status(for: statusID) else {
-            return nil
-        }
-        return (
-            content: { ConversationTableViewController(for: self.statusID, state: self.statusState.copy(), mastodonController: mastodonController) },
-            actions: { self.actionsForStatus(status, sourceView: self) }
-        )
-    }
-    
    // MARK: - Accessibility
    
    override var accessibilityLabel: String? {
@ -293,7 +282,7 @@ extension TimelineStatusTableViewCell: TableViewSwipeActionProvider {
                        return
                    }
                    completion(true)
-                    mastodonController.persistentContainer.addOrUpdate(status: status, incrementReferenceCount: false)
+                    mastodonController.persistentContainer.addOrUpdate(status: status)
                }
            })
        }
@ -320,7 +309,7 @@ extension TimelineStatusTableViewCell: TableViewSwipeActionProvider {
                        return
                    }
                    completion(true)
-                    mastodonController.persistentContainer.addOrUpdate(status: status, incrementReferenceCount: false)
+                    mastodonController.persistentContainer.addOrUpdate(status: status)
                }
            })
        }
@ -377,13 +366,13 @@ extension TimelineStatusTableViewCell: UIContextMenuInteractionDelegate {
        return UIContextMenuConfiguration(identifier: nil) {
            ProfileViewController(accountID: self.accountID, mastodonController: self.mastodonController)
        } actionProvider: { (_) in
-            return UIMenu(title: "", image: nil, identifier: nil, options: [], children: self.actionsForProfile(accountID: self.accountID, sourceView: self.avatarImageView))
+            return UIMenu(title: "", image: nil, identifier: nil, options: [], children: self.delegate?.actionsForProfile(accountID: self.accountID, sourceView: self.avatarImageView) ?? [])
        }
    }
    
    func contextMenuInteraction(_ interaction: UIContextMenuInteraction, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating) {
        if let viewController = animator.previewViewController,
-           let delegate = navigationDelegate {
+           let delegate = delegate {
            animator.preferredCommitStyle = .pop
            animator.addCompletion {
                if let customPresenting = viewController as? CustomPreviewPresenting {
@ -396,3 +385,16 @@ extension TimelineStatusTableViewCell: UIContextMenuInteractionDelegate {
    }

 }
+
+extension TimelineStatusTableViewCell: MenuPreviewProvider {
+    func getPreviewProviders(for location: CGPoint, sourceViewController: UIViewController) -> PreviewProviders? {
+        guard let mastodonController = mastodonController,
+              let status = mastodonController.persistentContainer.status(for: statusID) else {
+            return nil
+        }
+        return (
+            content: { ConversationTableViewController(for: self.statusID, state: self.statusState.copy(), mastodonController: mastodonController) },
+            actions: { self.delegate?.actionsForStatus(status, sourceView: self) ?? [] }
+        )
+    }
+}
--- a/Tusker/Views/Toast/ToastConfiguration.swift
+++ b/Tusker/Views/Toast/ToastConfiguration.swift
@ -35,12 +35,14 @@ struct ToastConfiguration {
 }

 extension ToastConfiguration {
-    init(from error: Client.Error, with title: String, in viewController: UIViewController, retryAction: @escaping (ToastView) -> Void) {
+    init(from error: Client.Error, with title: String, in viewController: UIViewController, retryAction: ((ToastView) -> Void)?) {
        self.init(title: title)
        self.subtitle = error.localizedDescription
        self.systemImageName = error.systemImageName
-        self.actionTitle = "Retry"
-        self.action = retryAction
+        if let retryAction = retryAction {
+            self.actionTitle = "Retry"
+            self.action = retryAction
+        }
        self.longPressAction = { [unowned viewController] toast in
            toast.dismissToast(animated: true)
            let text = """
Author	SHA1	Message	Date
Shadowfacts	56a0518c80	Add toast error messages to menu actions	2022-05-01 23:06:59 -04:00
Shadowfacts	bf8a294676	Split MenuActionProvider from MenuPreviewProvider	2022-05-01 23:05:23 -04:00
Shadowfacts	c069712c22	Don't include Open in Tusker on Catalyst	2022-05-01 21:50:16 -04:00
Shadowfacts	d04957ba41	Remove reference counting system Delete statuses/accounts that haven't been fetched in a week	2022-05-01 21:50:16 -04:00
Shadowfacts	8cc08cf4c0	Fix crash when displaying polls on Catalyst in Optimize for Mac Closes #152	2022-05-01 21:50:11 -04:00
Shadowfacts	1b917f6bed	Fix saved hashtags not getting persisted	2022-05-01 12:05:38 -04:00