Post status deleted notifications when load fails with not found

Packages/Pachyderm/Sources/Pachyderm/Model/Status.swift

@@ -64,8 +64,8 @@ public final class Status: StatusProtocol, Decodable {
         return request
     }
     
-    public static func delete(_ status: Status) -> Request<Empty> {
+    public static func delete(_ statusID: String) -> Request<Empty> {
-        return Request<Empty>(method: .delete, path: "/api/v1/statuses/\(status.id)")
+        return Request<Empty>(method: .delete, path: "/api/v1/statuses/\(statusID)")
     }
     
     public static func reblog(_ statusID: String, visibility: Visibility? = nil) -> Request<Status> {

Tusker.xcodeproj/project.pbxproj

@@ -152,6 +152,9 @@
 		D65B4B5E2973040D00DABDFB /* ReportAddStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B4B5D2973040D00DABDFB /* ReportAddStatusView.swift */; };
 		D65B4B6229771A3F00DABDFB /* FetchStatusService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B4B6129771A3F00DABDFB /* FetchStatusService.swift */; };
 		D65B4B6429771EFF00DABDFB /* ConversationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B4B6329771EFF00DABDFB /* ConversationViewController.swift */; };
+		D65B4B6629773AE600DABDFB /* DeleteStatusService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B4B6529773AE600DABDFB /* DeleteStatusService.swift */; };
+		D65B4B682977769E00DABDFB /* StatusActionAccountListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B4B672977769E00DABDFB /* StatusActionAccountListViewController.swift */; };
+		D65B4B6A297777D900DABDFB /* StatusNotFoundView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B4B69297777D900DABDFB /* StatusNotFoundView.swift */; };
 		D65C6BF525478A9C00A6E89C /* BackgroundableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65C6BF425478A9C00A6E89C /* BackgroundableViewController.swift */; };
 		D65F613423AEAB6600F3CFD3 /* OnboardingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65F613323AEAB6600F3CFD3 /* OnboardingTests.swift */; };
 		D6620ACE2511A0ED00312CA0 /* StatusStateResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6620ACD2511A0ED00312CA0 /* StatusStateResolver.swift */; };
@@ -299,7 +302,7 @@
 		D6CA8CDE296387310050C433 /* SaveToPhotosActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6CA8CDD296387310050C433 /* SaveToPhotosActivity.swift */; };
 		D6D12B2F2925D66500D528E1 /* TimelineGapCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D12B2E2925D66500D528E1 /* TimelineGapCollectionViewCell.swift */; };
 		D6D12B56292D57E800D528E1 /* AccountCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D12B55292D57E800D528E1 /* AccountCollectionViewCell.swift */; };
-		D6D12B58292D5B2C00D528E1 /* StatusActionAccountListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D12B57292D5B2C00D528E1 /* StatusActionAccountListViewController.swift */; };
+		D6D12B58292D5B2C00D528E1 /* StatusActionAccountListCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D12B57292D5B2C00D528E1 /* StatusActionAccountListCollectionViewController.swift */; };
 		D6D12B5A292D684600D528E1 /* AccountListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D12B59292D684600D528E1 /* AccountListViewController.swift */; };
 		D6D3F4C424FDB6B700EC4A6A /* View+ConditionalModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D3F4C324FDB6B700EC4A6A /* View+ConditionalModifier.swift */; };
 		D6D3FDE224F46A8D00FF50A5 /* ComposeUIState.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D3FDE124F46A8D00FF50A5 /* ComposeUIState.swift */; };
@@ -541,6 +544,9 @@
 		D65B4B5D2973040D00DABDFB /* ReportAddStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportAddStatusView.swift; sourceTree = "<group>"; };
 		D65B4B6129771A3F00DABDFB /* FetchStatusService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchStatusService.swift; sourceTree = "<group>"; };
 		D65B4B6329771EFF00DABDFB /* ConversationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationViewController.swift; sourceTree = "<group>"; };
+		D65B4B6529773AE600DABDFB /* DeleteStatusService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeleteStatusService.swift; sourceTree = "<group>"; };
+		D65B4B672977769E00DABDFB /* StatusActionAccountListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusActionAccountListViewController.swift; sourceTree = "<group>"; };
+		D65B4B69297777D900DABDFB /* StatusNotFoundView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusNotFoundView.swift; sourceTree = "<group>"; };
 		D65C6BF425478A9C00A6E89C /* BackgroundableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundableViewController.swift; sourceTree = "<group>"; };
 		D65F612D23AE990C00F3CFD3 /* Embassy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Embassy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D65F613023AE99E000F3CFD3 /* Ambassador.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Ambassador.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -692,7 +698,7 @@
 		D6CA8CDD296387310050C433 /* SaveToPhotosActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SaveToPhotosActivity.swift; sourceTree = "<group>"; };
 		D6D12B2E2925D66500D528E1 /* TimelineGapCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineGapCollectionViewCell.swift; sourceTree = "<group>"; };
 		D6D12B55292D57E800D528E1 /* AccountCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountCollectionViewCell.swift; sourceTree = "<group>"; };
-		D6D12B57292D5B2C00D528E1 /* StatusActionAccountListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusActionAccountListViewController.swift; sourceTree = "<group>"; };
+		D6D12B57292D5B2C00D528E1 /* StatusActionAccountListCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusActionAccountListCollectionViewController.swift; sourceTree = "<group>"; };
 		D6D12B59292D684600D528E1 /* AccountListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountListViewController.swift; sourceTree = "<group>"; };
 		D6D3F4C324FDB6B700EC4A6A /* View+ConditionalModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+ConditionalModifier.swift"; sourceTree = "<group>"; };
 		D6D3FDE124F46A8D00FF50A5 /* ComposeUIState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeUIState.swift; sourceTree = "<group>"; };
@@ -1290,7 +1296,8 @@
 		D6A3BC8C2321FF9B00FD64D5 /* Status Action Account List */ = {
 			isa = PBXGroup;
 			children = (
-				D6D12B57292D5B2C00D528E1 /* StatusActionAccountListViewController.swift */,
+				D65B4B672977769E00DABDFB /* StatusActionAccountListViewController.swift */,
+				D6D12B57292D5B2C00D528E1 /* StatusActionAccountListCollectionViewController.swift */,
 			);
 			path = "Status Action Account List";
 			sourceTree = "<group>";
@@ -1380,6 +1387,7 @@
 				D6D7069F29466649000827ED /* ScrollingSegmentedControl.swift */,
 				D627943123A5466600D38C68 /* SelectableTableViewCell.swift */,
 				D620483723D38190008A63EF /* StatusContentTextView.swift */,
+				D65B4B69297777D900DABDFB /* StatusNotFoundView.swift */,
 				04ED00B021481ED800567C53 /* SteppedProgressView.swift */,
 				D6093FB625BE0CF3004811E6 /* TrendHistoryView.swift */,
 				D686BBE224FBF8110068E6AA /* WrappedProgressView.swift */,
@@ -1612,6 +1620,7 @@
 				D61F75B2293BD89C00C0B37F /* UpdateFilterService.swift */,
 				D61F75B4293BD97400C0B37F /* DeleteFilterService.swift */,
 				D65B4B6129771A3F00DABDFB /* FetchStatusService.swift */,
+				D65B4B6529773AE600DABDFB /* DeleteStatusService.swift */,
 			);
 			path = API;
 			sourceTree = "<group>";
@@ -1905,6 +1914,7 @@
 				D69693FA25859A8000F4E116 /* ComposeSceneDelegate.swift in Sources */,
 				D6A3BC8A2321F79B00FD64D5 /* AccountTableViewCell.swift in Sources */,
 				D66A77BB233838DC0058F1EC /* UIFont+Traits.swift in Sources */,
+				D65B4B682977769E00DABDFB /* StatusActionAccountListViewController.swift in Sources */,
 				D61F759B29384F9C00C0B37F /* FilterMO.swift in Sources */,
 				D68FEC4F232C5BC300C84F23 /* SegmentedPageViewController.swift in Sources */,
 				D64AAE9126C80DC600FC57FB /* ToastView.swift in Sources */,
@@ -1985,6 +1995,7 @@
 				D6114E0D27F7FEB30080E273 /* TrendingStatusesViewController.swift in Sources */,
 				D6BC9DDA232D8BE5002CA326 /* SearchResultsViewController.swift in Sources */,
 				D61ABEF628EE74D400B29151 /* StatusCollectionViewCell.swift in Sources */,
+				D65B4B6629773AE600DABDFB /* DeleteStatusService.swift in Sources */,
 				D61DC84628F498F200B82C6E /* Logging.swift in Sources */,
 				D6B17255254F88B800128392 /* OppositeCollapseKeywordsView.swift in Sources */,
 				D6A00B1D26379FC900316AD4 /* PollOptionsView.swift in Sources */,
@@ -2064,7 +2075,7 @@
 				D620483423D3801D008A63EF /* LinkTextView.swift in Sources */,
 				D61F75882932DB6000C0B37F /* StatusSwipeAction.swift in Sources */,
 				D68A76EA295285D0001DA1B3 /* AddHashtagPinnedTimelineView.swift in Sources */,
-				D6D12B58292D5B2C00D528E1 /* StatusActionAccountListViewController.swift in Sources */,
+				D6D12B58292D5B2C00D528E1 /* StatusActionAccountListCollectionViewController.swift in Sources */,
 				D6412B0D24B0D4CF00F5412E /* ProfileHeaderView.swift in Sources */,
 				D641C77F213DC78A004B4513 /* InlineTextAttachment.swift in Sources */,
 				D61A45E628DC0F2F002BE511 /* ConfirmLoadMoreCollectionViewCell.swift in Sources */,
@@ -2156,6 +2167,7 @@
 				D6E426B325337C7000C02E1C /* CustomEmojiImageView.swift in Sources */,
 				D6D4DDD0212518A000E1C4BB /* AppDelegate.swift in Sources */,
 				D61F75B3293BD89C00C0B37F /* UpdateFilterService.swift in Sources */,
+				D65B4B6A297777D900DABDFB /* StatusNotFoundView.swift in Sources */,
 				D6412B0924B0291E00F5412E /* MyProfileViewController.swift in Sources */,
 				D6D12B56292D57E800D528E1 /* AccountCollectionViewCell.swift in Sources */,
 				D6A6C10525B6138A00298D0F /* StatusTablePrefetching.swift in Sources */,

Tusker/API/DeleteStatusService.swift

@@ -0,0 +1,63 @@
+//
+//  DeleteStatusService.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 1/17/23.
+//  Copyright © 2023 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Pachyderm
+
+@MainActor
+class DeleteStatusService {
+    let status: StatusMO
+    let mastodonController: MastodonController
+    let presenter: any TuskerNavigationDelegate
+    
+    init(status: StatusMO, mastodonController: MastodonController, presenter: any TuskerNavigationDelegate) {
+        self.status = status
+        self.mastodonController = mastodonController
+        self.presenter = presenter
+    }
+    
+    func run() async {
+        do {
+            let req = Status.delete(status.id)
+            let _ = try await mastodonController.run(req)
+            
+            // we deliberately don't remove the status from the cache because there are almost certainly places where it'll still be fetched again
+            
+            var reblogIDs = [String]()
+            let reblogsReq = StatusMO.fetchRequest()
+            reblogsReq.predicate = NSPredicate(format: "reblog = %@", status)
+            if let reblogs = try? mastodonController.persistentContainer.viewContext.fetch(reblogsReq) {
+                reblogIDs = reblogs.map(\.id)
+            }
+            
+            NotificationCenter.default.post(name: .statusDeleted, object: nil, userInfo: [
+                "accountID": mastodonController.accountInfo!.id,
+                "statusIDs": [status.id] + reblogIDs,
+            ])
+        } catch {
+            let message: String
+            if let error = error as? Client.Error {
+                message = error.localizedDescription
+            } else {
+                message = error.localizedDescription
+            }
+            let alert = UIAlertController(title: "Error Deleting Post", message: message, preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+            alert.addAction(UIAlertAction(title: "Retry", style: .default, handler: { _ in
+                Task {
+                    await self.run()
+                }
+            }))
+            presenter.present(alert, animated: true)
+        }
+    }
+}
+
+extension Foundation.Notification.Name {
+    static let statusDeleted = Foundation.Notification.Name("statusDeleted")
+}

Tusker/API/FetchStatusService.swift

@@ -36,7 +36,24 @@ class FetchStatusService {
     }
     
     private func handleStatusNotFound() {
-        // todo: remove from persistent store, send notifications
+        // todo: what about when browsing on another instance?
+        guard let accountID = mastodonController.accountInfo?.id else {
+            return
+        }
+        
+        var reblogIDs = [String]()
+        if let cached = mastodonController.persistentContainer.status(for: statusID) {
+            let reblogsReq = StatusMO.fetchRequest()
+            reblogsReq.predicate = NSPredicate(format: "reblog = %@", cached)
+            if let reblogs = try? mastodonController.persistentContainer.viewContext.fetch(reblogsReq) {
+                reblogIDs = reblogs.map(\.id)
+            }
+        }
+        
+        NotificationCenter.default.post(name: .statusDeleted, object: nil, userInfo: [
+            "accountID": accountID,
+            "statusIDs": [statusID] + reblogIDs
+        ])
     }
     
     enum Result {

Tusker/Screens/Bookmarks/BookmarksTableViewController.swift

@@ -48,6 +48,8 @@ class BookmarksTableViewController: EnhancedTableViewController {
         tableView.prefetchDataSource = self
 
         userActivity = UserActivityManager.bookmarksActivity()
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -152,6 +154,21 @@ class BookmarksTableViewController: EnhancedTableViewController {
         return config
     }
     
+    @objc private func handleStatusDeleted(_ notification: Foundation.Notification) {
+        guard let userInfo = notification.userInfo,
+              let accountID = mastodonController.accountInfo?.id,
+              userInfo["accountID"] as? String == accountID,
+              let statusIDs = userInfo["statusIDs"] as? [String] else {
+            return
+        }
+        let indicesToDelete = statusIDs
+            .compactMap { id in
+                self.statuses.firstIndex(where: { $0.id == id })
+            }
+        self.statuses.remove(atOffsets: IndexSet(indicesToDelete))
+        self.tableView.deleteRows(at: indicesToDelete.map { IndexPath(row: $0, section: 0) }, with: .automatic)
+    }
+    
 }
 
 extension BookmarksTableViewController: TuskerNavigationDelegate {

Tusker/Screens/Conversation/ConversationTableViewController.swift

@@ -134,7 +134,9 @@ class ConversationTableViewController: EnhancedTableViewController {
         
         let mainStatusItem = Item.status(id: mainStatusID, state: mainStatusState)
         
-        var snapshot = self.dataSource.snapshot()
+        var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
+        snapshot.appendSections([.statuses])
+        snapshot.appendItems([mainStatusItem], toSection: .statuses)
         snapshot.insertItems(parentIDs.map { .status(id: $0, state: .unknown) }, beforeItem: mainStatusItem)
         
         // fetch all descendant status managed objects

Tusker/Screens/Conversation/ConversationViewController.swift

@@ -91,6 +91,8 @@ class ConversationViewController: UIViewController {
         let appearance = UINavigationBarAppearance()
         appearance.configureWithDefaultBackground()
         navigationItem.scrollEdgeAppearance = appearance
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
     }
     
     private func updateVisibilityBarButtonItem() {
@@ -113,6 +115,23 @@ class ConversationViewController: UIViewController {
         }
     }
     
+    @objc private func handleStatusDeleted(_ notification: Foundation.Notification) {
+        guard let userInfo = notification.userInfo,
+              let accountID = mastodonController.accountInfo?.id,
+              userInfo["accountID"] as? String == accountID,
+              let statusIDs = userInfo["statusIDs"] as? [String] else {
+            return
+        }
+        if statusIDs.contains(mainStatusID) {
+            state = .notFound
+        } else if case .displaying(_) = state {
+            let mainStatus = mastodonController.persistentContainer.status(for: mainStatusID)!
+            Task {
+                await loadContext(for: mainStatus)
+            }
+        }
+    }
+    
     // MARK: Loading
     
     private func loadMainStatus() async {
@@ -123,7 +142,6 @@ class ConversationViewController: UIViewController {
                 return mastodonController.persistentContainer.addOrUpdateOnViewContext(status: status)
             case .notFound:
                 state = .notFound
-                showMainStatusNotFound()
                 return nil
             case .error(let error):
                 self.showMainStatusError(error)
@@ -190,41 +208,13 @@ class ConversationViewController: UIViewController {
     }
     
     private func showMainStatusNotFound() {
-        let emoji = UILabel()
+        let notFoundView = StatusNotFoundView(frame: .zero)
-        emoji.font = .systemFont(ofSize: 64)
+        notFoundView.translatesAutoresizingMaskIntoConstraints = false
-        emoji.text = "🤷"
+        view.addSubview(notFoundView)
-        
-        let title = UILabel()
-        title.textColor = .secondaryLabel
-        title.font = .preferredFont(forTextStyle: .title1).withTraits(.traitBold)!
-        title.adjustsFontForContentSizeCategory = true
-        title.text = "Not Found"
-        
-        let subtitle = UILabel()
-        subtitle.textColor = .secondaryLabel
-        subtitle.font = .preferredFont(forTextStyle: .body)
-        subtitle.adjustsFontForContentSizeCategory = true
-        subtitle.text = "The post you are looking for may have been deleted, or may not be visible to you."
-        subtitle.numberOfLines = 0
-        subtitle.textAlignment = .center
-        
-        let stack = UIStackView(arrangedSubviews: [
-            emoji,
-            title,
-            subtitle,
-        ])
-        stack.axis = .vertical
-        stack.alignment = .center
-        stack.spacing = 8
-        stack.isAccessibilityElement = true
-        stack.accessibilityLabel = "\(title.text!). \(subtitle.text!)"
-        
-        stack.translatesAutoresizingMaskIntoConstraints = false
-        view.addSubview(stack)
         NSLayoutConstraint.activate([
-            stack.leadingAnchor.constraint(equalToSystemSpacingAfter: view.safeAreaLayoutGuide.leadingAnchor, multiplier: 1),
+            notFoundView.leadingAnchor.constraint(equalToSystemSpacingAfter: view.safeAreaLayoutGuide.leadingAnchor, multiplier: 1),
-            view.safeAreaLayoutGuide.trailingAnchor.constraint(equalToSystemSpacingAfter: stack.trailingAnchor, multiplier: 1),
+            view.safeAreaLayoutGuide.trailingAnchor.constraint(equalToSystemSpacingAfter: notFoundView.trailingAnchor, multiplier: 1),
-            stack.centerYAnchor.constraint(equalTo: view.safeAreaLayoutGuide.centerYAnchor),
+            notFoundView.centerYAnchor.constraint(equalTo: view.safeAreaLayoutGuide.centerYAnchor),
         ])
     }
     
@@ -259,4 +249,21 @@ extension ConversationViewController {
 }
 
 extension ConversationViewController: ToastableViewController {
+    var toastScrollView: UIScrollView? {
+        if case .displaying(let vc) = state {
+            return vc.toastScrollView
+        } else {
+            return nil
+        }
+    }
+}
+
+extension ConversationViewController: StatusBarTappableViewController {
+    func handleStatusBarTapped(xPosition: CGFloat) -> StatusBarTapActionResult {
+        if case .displaying(let vc) = state {
+            return vc.handleStatusBarTapped(xPosition: xPosition)
+        } else {
+            return .continue
+        }
+    }
 }

Tusker/Screens/Explore/TrendingStatusesViewController.swift

@@ -101,6 +101,12 @@ class TrendingStatusesViewController: UIViewController {
         }
     }
     
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
+    }
+
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
@@ -137,6 +143,27 @@ class TrendingStatusesViewController: UIViewController {
         snapshot.appendItems(statuses.map { .status(id: $0.id, collapseState: .unknown, filterState: .unknown) })
         await dataSource.apply(snapshot)
     }
+    
+    @objc private func handleStatusDeleted(_ notification: Foundation.Notification) {
+        guard let userInfo = notification.userInfo,
+              let accountID = mastodonController.accountInfo?.id,
+              userInfo["accountID"] as? String == accountID,
+              let statusIDs = userInfo["statusIDs"] as? [String] else {
+            return
+        }
+        var snapshot = self.dataSource.snapshot()
+        let toDelete = statusIDs
+            .map { id in
+                Item.status(id: id, collapseState: .unknown, filterState: .unknown)
+            }
+            .filter { item in
+                snapshot.itemIdentifiers.contains(item)
+            }
+        if !toDelete.isEmpty {
+            snapshot.deleteItems(toDelete)
+            self.dataSource.apply(snapshot, animatingDifferences: true)
+        }
+    }
 }
 
 extension TrendingStatusesViewController {

Tusker/Screens/Notifications/NotificationsTableViewController.swift

@@ -58,6 +58,31 @@ class NotificationsTableViewController: DiffableTimelineLikeTableViewController<
         
         tableView.cellLayoutMarginsFollowReadableWidth = true
         tableView.allowsFocus = true
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
+    }
+    
+    @objc private func handleStatusDeleted(_ notification: Foundation.Notification) {
+        guard let userInfo = notification.userInfo,
+              let accountID = mastodonController.accountInfo?.id,
+              userInfo["accountID"] as? String == accountID,
+              let statusIDs = userInfo["statusIDs"] as? [String] else {
+            return
+        }
+        var snapshot = self.dataSource.snapshot()
+        // this is not efficient, since the number of notifications is almost certainly greater than the number of deleted statuses
+        // but we can't just check if the status is in the data source, since we don't have the corresponding notification/group
+        let toDelete = snapshot.itemIdentifiers
+            .filter { item in
+                guard case .notificationGroup(let group) = item else {
+                    return false
+                }
+                return group.kind == .mention && statusIDs.contains(group.notifications.first!.status!.id)
+            }
+        if !toDelete.isEmpty {
+            snapshot.deleteItems(toDelete)
+            self.dataSource.apply(snapshot, animatingDifferences: true)
+        }
     }
 
     private func request(range: RequestRange) -> Request<[Pachyderm.Notification]> {

Tusker/Screens/Profile/ProfileStatusesViewController.swift

@@ -143,6 +143,8 @@ class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionVie
         filterer.filtersChanged = { [unowned self] actionsChanged in
             self.reapplyFilters(actionsChanged: actionsChanged)
         }
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
     }
     
     private func createDataSource() -> UICollectionViewDiffableDataSource<Section, Item> {
@@ -344,6 +346,31 @@ class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionVie
         }
     }
     
+    @objc private func handleStatusDeleted(_ notification: Foundation.Notification) {
+        guard let userInfo = notification.userInfo,
+              let accountID = mastodonController.accountInfo?.id,
+              userInfo["accountID"] as? String == accountID,
+              let statusIDs = userInfo["statusIDs"] as? [String] else {
+            return
+        }
+        var snapshot = self.dataSource.snapshot()
+        let toDelete = statusIDs
+            .flatMap { id in
+                // need to delete from both pinned and non-pinned sections
+                [
+                    Item.status(id: id, collapseState: .unknown, filterState: .unknown, pinned: false),
+                    Item.status(id: id, collapseState: .unknown, filterState: .unknown, pinned: true),
+                ]
+            }
+            .filter { item in
+                snapshot.itemIdentifiers.contains(item)
+            }
+        if !toDelete.isEmpty {
+            snapshot.deleteItems(toDelete)
+            self.dataSource.apply(snapshot, animatingDifferences: true)
+        }
+    }
+    
 }
 
 extension ProfileStatusesViewController {
@@ -376,6 +403,7 @@ extension ProfileStatusesViewController {
         typealias TimelineItem = String
         
         case header(String)
+        // the status item must contain the pinned state, since a status can appear in both the pinned and regular sections simultaneously
         case status(id: String, collapseState: CollapseState, filterState: FilterState, pinned: Bool)
         case loadingIndicator
         case confirmLoadMore

Tusker/Screens/Search/SearchResultsViewController.swift

@@ -121,6 +121,8 @@ class SearchResultsViewController: EnhancedTableViewController {
             .sink(receiveValue: performSearch(query:))
 
         userActivity = UserActivityManager.searchActivity()
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
     }
     
     override func targetViewController(forAction action: Selector, sender: Any?) -> UIViewController? {
@@ -207,6 +209,28 @@ class SearchResultsViewController: EnhancedTableViewController {
         errorLabel.text = error.localizedDescription
     }
     
+    @objc private func handleStatusDeleted(_ notification: Foundation.Notification) {
+        guard let userInfo = notification.userInfo,
+              let accountID = mastodonController.accountInfo?.id,
+              userInfo["accountID"] as? String == accountID,
+              let statusIDs = userInfo["statusIDs"] as? [String] else {
+            return
+        }
+        var snapshot = self.dataSource.snapshot()
+        let toDelete = statusIDs
+            .map { id in
+                Item.status(id, .unknown)
+            }
+            .filter { item in
+                snapshot.itemIdentifiers.contains(item)
+            }
+        if !toDelete.isEmpty {
+            snapshot.deleteItems(toDelete)
+            self.dataSource.apply(snapshot, animatingDifferences: true)
+        }
+    }
+
+    
     // MARK: - Table view delegate
     
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {

Tusker/Screens/Status Action Account List/StatusActionAccountListCollectionViewController.swift

@@ -0,0 +1,237 @@
+//
+//  StatusActionAccountListCollectionViewController.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 9/5/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Pachyderm
+
+class StatusActionAccountListCollectionViewController: UIViewController, CollectionViewController {
+    
+    private let mastodonController: MastodonController
+    
+    /// If `true`, a warning will be shown below the account list describing that the total favs/reblogs may be innacurate.
+    var showInacurateCountWarning = false
+    
+    var collectionView: UICollectionView! {
+        view as? UICollectionView
+    }
+    private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
+    
+    /**
+     Creates a new view controller showing the accounts that performed the given action on the given status.
+     
+     - Parameter mastodonController The `MastodonController` instance this view controller uses.
+     */
+    init(mastodonController: MastodonController) {
+        self.mastodonController = mastodonController
+        
+        super.init(nibName: nil, bundle: nil)
+        
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func loadView() {
+        let layout = UICollectionViewCompositionalLayout { [unowned self] sectionIndex, environment in
+            switch dataSource.sectionIdentifier(for: sectionIndex)! {
+            case .status:
+                var config = UICollectionLayoutListConfiguration(appearance: .grouped)
+                config.footerMode = self.showInacurateCountWarning ? .supplementary : .none
+                config.leadingSwipeActionsConfigurationProvider = { [unowned self] in
+                    (collectionView.cellForItem(at: $0) as? TimelineStatusCollectionViewCell)?.leadingSwipeActions()
+                }
+                config.trailingSwipeActionsConfigurationProvider = { [unowned self] in
+                    (collectionView.cellForItem(at: $0) as? TimelineStatusCollectionViewCell)?.trailingSwipeActions()
+                }
+                return NSCollectionLayoutSection.list(using: config, layoutEnvironment: environment)
+            case .accounts:
+                return NSCollectionLayoutSection.list(using: .init(appearance: .grouped), layoutEnvironment: environment)
+            }
+        }
+        view = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        collectionView.delegate = self
+        collectionView.dragDelegate = self
+        collectionView.allowsFocus = true
+        dataSource = createDataSource()
+    }
+    
+    private func createDataSource() -> UICollectionViewDiffableDataSource<Section, Item> {
+        let statusCell = UICollectionView.CellRegistration<TimelineStatusCollectionViewCell, (String, CollapseState)> { [unowned self] cell, indexPath, item in
+            cell.delegate = self
+            cell.updateUI(statusID: item.0, state: item.1, filterResult: .allow, precomputedContent: nil)
+        }
+        let accountCell = UICollectionView.CellRegistration<AccountCollectionViewCell, String> { [unowned self] cell, indexPath, item in
+            cell.delegate = self
+            cell.updateUI(accountID: item)
+        }
+        let dataSource = UICollectionViewDiffableDataSource<Section, Item>(collectionView: collectionView) { collectionView, indexPath, itemIdentifier in
+            switch itemIdentifier {
+            case .status(let id, let state):
+                return collectionView.dequeueConfiguredReusableCell(using: statusCell, for: indexPath, item: (id, state))
+            case .account(let id):
+                return collectionView.dequeueConfiguredReusableCell(using: accountCell, for: indexPath, item: id)
+            }
+        }
+        let sectionHeaderCell = UICollectionView.SupplementaryRegistration<UICollectionViewListCell>(elementKind: UICollectionView.elementKindSectionFooter) { (headerView, collectionView, indexPath) in
+            var config = headerView.defaultContentConfiguration()
+            config.text = NSLocalizedString("Favorite and reblog counts for posts originating from instances other than your own may not be accurate.", comment: "shown on lists of status total actions")
+            headerView.contentConfiguration = config
+        }
+        dataSource.supplementaryViewProvider = { collectionView, elementKind, indexPath in
+            return collectionView.dequeueConfiguredReusableSupplementary(using: sectionHeaderCell, for: indexPath)
+        }
+        return dataSource
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        
+        clearSelectionOnAppear(animated: animated)
+    }
+    
+    func addStatus(_ status: StatusMO, state: CollapseState) {
+        loadViewIfNeeded()
+        
+        var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
+        snapshot.appendSections([.status, .accounts])
+        snapshot.appendItems([.status(status.id, state)], toSection: .status)
+        dataSource.apply(snapshot, animatingDifferences: false)
+    }
+    
+    func addAccounts(_ accountIDs: [String], animated: Bool) {
+        var snapshot = dataSource.snapshot()
+        snapshot.appendItems(accountIDs.map { .account($0) }, toSection: .accounts)
+        dataSource.apply(snapshot, animatingDifferences: animated)
+    }
+    
+}
+
+extension StatusActionAccountListCollectionViewController {
+    enum Section {
+        case status
+        case accounts
+    }
+    enum Item: Hashable {
+        case status(String, CollapseState)
+        case account(String)
+        
+        static func ==(lhs: Item, rhs: Item) -> Bool {
+            switch (lhs, rhs) {
+            case (.status(let a, _), .status(let b, _)):
+                return a == b
+            case (.account(let a), .account(let b)):
+                return a == b
+            default:
+                return false
+            }
+        }
+        
+        func hash(into hasher: inout Hasher) {
+            switch self {
+            case .status(let id, _):
+                hasher.combine(0)
+                hasher.combine(id)
+            case .account(let id):
+                hasher.combine(1)
+                hasher.combine(id)
+            }
+        }
+    }
+}
+
+extension StatusActionAccountListCollectionViewController: UICollectionViewDelegate {
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        switch dataSource.itemIdentifier(for: indexPath) {
+        case nil:
+            return
+        case .status(let id, let state):
+            selected(status: id, state: state.copy())
+        case .account(let id):
+            selected(account: id)
+        }
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {
+        guard let item = dataSource.itemIdentifier(for: indexPath),
+              let cell = collectionView.cellForItem(at: indexPath) else {
+            return nil
+        }
+        switch item {
+        case .status:
+            return (cell as? TimelineStatusCollectionViewCell)?.contextMenuConfiguration()
+        case .account(let id):
+            return UIContextMenuConfiguration {
+                ProfileViewController(accountID: id, mastodonController: self.mastodonController)
+            } actionProvider: { _ in
+                UIMenu(children: self.actionsForProfile(accountID: id, source: .view(cell)))
+            }
+        }
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating) {
+        MenuPreviewHelper.willPerformPreviewAction(animator: animator, presenter: self)
+    }
+}
+
+extension StatusActionAccountListCollectionViewController: UICollectionViewDragDelegate {
+    func collectionView(_ collectionView: UICollectionView, itemsForBeginning session: UIDragSession, at indexPath: IndexPath) -> [UIDragItem] {
+        guard let currentAccountID = mastodonController.accountInfo?.id,
+              let item = dataSource.itemIdentifier(for: indexPath) else {
+            return []
+        }
+        let provider: NSItemProvider
+        switch item {
+        case .status(let id, _):
+            guard let status = mastodonController.persistentContainer.status(for: id) else {
+                return []
+            }
+            provider = NSItemProvider(object: status.url! as NSURL)
+            let activity = UserActivityManager.showConversationActivity(mainStatusID: id, accountID: currentAccountID)
+            activity.displaysAuxiliaryScene = true
+            provider.registerObject(activity, visibility: .all)
+        case .account(let id):
+            guard let account = mastodonController.persistentContainer.account(for: id) else {
+                return []
+            }
+            provider = NSItemProvider(object: account.url as NSURL)
+            let activity = UserActivityManager.showProfileActivity(id: account.id, accountID: currentAccountID)
+            activity.displaysAuxiliaryScene = true
+            provider.registerObject(activity, visibility: .all)
+        }
+        return [UIDragItem(itemProvider: provider)]
+    }
+}
+
+extension StatusActionAccountListCollectionViewController: TuskerNavigationDelegate {
+    var apiController: MastodonController! { mastodonController }
+}
+
+extension StatusActionAccountListCollectionViewController: MenuActionProvider {
+}
+
+extension StatusActionAccountListCollectionViewController: StatusCollectionViewCellDelegate {
+    func statusCellNeedsReconfigure(_ cell: StatusCollectionViewCell, animated: Bool, completion: (() -> Void)?) {
+        if let indexPath = collectionView.indexPath(for: cell) {
+            var snapshot = dataSource.snapshot()
+            snapshot.reconfigureItems([dataSource.itemIdentifier(for: indexPath)!])
+            dataSource.apply(snapshot, animatingDifferences: animated, completion: completion)
+        }
+    }
+    
+    func statusCellShowFiltered(_ cell: StatusCollectionViewCell) {
+        fatalError()
+    }
+}
+
+extension StatusActionAccountListCollectionViewController: StatusBarTappableViewController {
+    func handleStatusBarTapped(xPosition: CGFloat) -> StatusBarTapActionResult {
+        collectionView.scrollToTop()
+        return .stop
+    }
+}

Tusker/Screens/Status Action Account List/StatusActionAccountListViewController.swift

@@ -2,28 +2,58 @@
 //  StatusActionAccountListViewController.swift
 //  Tusker
 //
-//  Created by Shadowfacts on 9/5/19.
+//  Created by Shadowfacts on 1/17/23.
-//  Copyright © 2019 Shadowfacts. All rights reserved.
+//  Copyright © 2023 Shadowfacts. All rights reserved.
 //
 
 import UIKit
 import Pachyderm
 
-class StatusActionAccountListViewController: UIViewController, CollectionViewController {
+class StatusActionAccountListViewController: UIViewController {
     
     private let mastodonController: MastodonController
-    private let actionType: ActionType
+    private let actionType: StatusActionAccountListViewController.ActionType
     private let statusID: String
     private let statusState: CollapseState
     private var accountIDs: [String]?
     
     /// If `true`, a warning will be shown below the account list describing that the total favs/reblogs may be innacurate.
-    var showInacurateCountWarning = false
+    var showInacurateCountWarning = false {
-    
+        didSet {
-    var collectionView: UICollectionView! {
+            if case .displaying(let vc) = state {
-        view as? UICollectionView
+                vc.showInacurateCountWarning = showInacurateCountWarning
+            }
+        }
+    }
+    
+    private var state: State = .unloaded {
+        didSet {
+            switch oldValue {
+            case .loading(let indicator):
+                indicator.removeFromSuperview()
+            case .displaying(let vc):
+                vc.removeViewAndController()
+            default:
+                break
+            }
+            
+            switch state {
+            case .unloaded:
+                break
+            case .loading(let indicator):
+                indicator.translatesAutoresizingMaskIntoConstraints = false
+                view.addSubview(indicator)
+                NSLayoutConstraint.activate([
+                    indicator.centerXAnchor.constraint(equalTo: view.safeAreaLayoutGuide.centerXAnchor),
+                    indicator.centerYAnchor.constraint(equalTo: view.safeAreaLayoutGuide.centerYAnchor),
+                ])
+            case .displaying(let vc):
+                embedChild(vc)
+            case .notFound:
+                showStatusNotFound()
+            }
+        }
     }
-    private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
     
     /**
      Creates a new view controller showing the accounts that performed the given action on the given status.
@@ -33,7 +63,7 @@ class StatusActionAccountListViewController: UIViewController, CollectionViewCon
      - Parameter accountIDs The accounts that will be shown. If `nil` is passed, a request will be performed to load the accounts.
      - Parameter mastodonController The `MastodonController` instance this view controller uses.
      */
-    init(actionType: ActionType, statusID: String, statusState: CollapseState, accountIDs: [String]?, mastodonController: MastodonController) {
+    init(actionType: StatusActionAccountListViewController.ActionType, statusID: String, statusState: CollapseState, accountIDs: [String]?, mastodonController: MastodonController) {
         self.mastodonController = mastodonController
         self.actionType = actionType
         self.statusID = statusID
@@ -41,6 +71,14 @@ class StatusActionAccountListViewController: UIViewController, CollectionViewCon
         self.accountIDs = accountIDs
 
         super.init(nibName: nil, bundle: nil)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
         
         switch actionType {
         case .favorite:
@@ -48,89 +86,76 @@ class StatusActionAccountListViewController: UIViewController, CollectionViewCon
         case .reblog:
             title = NSLocalizedString("Reblogged By", comment: "status reblogged by accounts list title")
         }
-    }
 
-    required init?(coder: NSCoder) {
+        view.backgroundColor = .secondarySystemBackground
-        fatalError("init(coder:) has not been implemented")
-    }
         
-    override func loadView() {
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
-        let layout = UICollectionViewCompositionalLayout { [unowned self] sectionIndex, environment in
-            switch dataSource.sectionIdentifier(for: sectionIndex)! {
-            case .status:
-                var config = UICollectionLayoutListConfiguration(appearance: .grouped)
-                config.footerMode = self.showInacurateCountWarning ? .supplementary : .none
-                config.leadingSwipeActionsConfigurationProvider = { [unowned self] in
-                    (collectionView.cellForItem(at: $0) as? TimelineStatusCollectionViewCell)?.leadingSwipeActions()
-                }
-                config.trailingSwipeActionsConfigurationProvider = { [unowned self] in
-                    (collectionView.cellForItem(at: $0) as? TimelineStatusCollectionViewCell)?.trailingSwipeActions()
-                }
-                return NSCollectionLayoutSection.list(using: config, layoutEnvironment: environment)
-            case .accounts:
-                return NSCollectionLayoutSection.list(using: .init(appearance: .grouped), layoutEnvironment: environment)
-            }
-        }
-        view = UICollectionView(frame: .zero, collectionViewLayout: layout)
-        collectionView.delegate = self
-        collectionView.dragDelegate = self
-        collectionView.allowsFocus = true
-        dataSource = createDataSource()
-    }
-    
-    private func createDataSource() -> UICollectionViewDiffableDataSource<Section, Item> {
-        let statusCell = UICollectionView.CellRegistration<TimelineStatusCollectionViewCell, Void> { [unowned self] cell, indexPath, _ in
-            cell.delegate = self
-            cell.updateUI(statusID: self.statusID, state: self.statusState, filterResult: .allow, precomputedContent: nil)
-        }
-        let accountCell = UICollectionView.CellRegistration<AccountCollectionViewCell, String> { [unowned self] cell, indexPath, item in
-            cell.delegate = self
-            cell.updateUI(accountID: item)
-        }
-        let dataSource = UICollectionViewDiffableDataSource<Section, Item>(collectionView: collectionView) { collectionView, indexPath, itemIdentifier in
-            switch itemIdentifier {
-            case .status:
-                return collectionView.dequeueConfiguredReusableCell(using: statusCell, for: indexPath, item: ())
-            case .account(let id):
-                return collectionView.dequeueConfiguredReusableCell(using: accountCell, for: indexPath, item: id)
-            }
-        }
-        let sectionHeaderCell = UICollectionView.SupplementaryRegistration<UICollectionViewListCell>(elementKind: UICollectionView.elementKindSectionFooter) { (headerView, collectionView, indexPath) in
-            var config = headerView.defaultContentConfiguration()
-            config.text = NSLocalizedString("Favorite and reblog counts for posts originating from instances other than your own may not be accurate.", comment: "shown on lists of status total actions")
-            headerView.contentConfiguration = config
-        }
-        dataSource.supplementaryViewProvider = { collectionView, elementKind, indexPath in
-            return collectionView.dequeueConfiguredReusableSupplementary(using: sectionHeaderCell, for: indexPath)
-        }
-        return dataSource
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
-        snapshot.appendSections([.status, .accounts])
-        snapshot.appendItems([.status], toSection: .status)
-        if let accountIDs {
-            snapshot.appendItems(accountIDs.map { .account($0) }, toSection: .accounts)
-        }
-        dataSource.apply(snapshot, animatingDifferences: false)
     }
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
-        clearSelectionOnAppear(animated: animated)
+        Task {
+            await loadStatus()
+        }
+    }
     
-        if accountIDs == nil {
+    @objc private func handleStatusDeleted(_ notification: Foundation.Notification) {
-            Task {
+        guard let userInfo = notification.userInfo,
-                await loadAccounts()
+              let accountID = mastodonController.accountInfo?.id,
+              userInfo["accountID"] as? String == accountID,
+              let statusIDs = userInfo["statusIDs"] as? [String] else {
+            return
+        }
+        if statusIDs.contains(statusID) {
+            state = .notFound
+        }
+    }
+    
+    // MARK: Loading
+    
+    private func loadStatus() async {
+        @MainActor
+        func doLoadStatus() async -> StatusMO? {
+            switch await FetchStatusService(statusID: statusID, mastodonController: mastodonController).run() {
+            case .loaded(let status):
+                return mastodonController.persistentContainer.addOrUpdateOnViewContext(status: status)
+            case .notFound:
+                state = .notFound
+                return nil
+            case .error(let error):
+                self.showStatusError(error)
+                return nil
+            }
+        }
+
+        if let cached = mastodonController.persistentContainer.status(for: statusID) {
+            await statusLoaded(cached)
+        } else {
+            let indicator = UIActivityIndicatorView(style: .medium)
+            indicator.startAnimating()
+            state = .loading(indicator)
+
+            if let status = await doLoadStatus() {
+                await statusLoaded(status)
             }
         }
     }
     
-    private func loadAccounts() async {
+    private func statusLoaded(_ status: StatusMO) async {
+        let vc = StatusActionAccountListCollectionViewController(mastodonController: mastodonController)
+        vc.addStatus(status, state: statusState)
+        vc.showInacurateCountWarning = showInacurateCountWarning
+        state = .displaying(vc)
+        
+        if let accountIDs {
+            vc.addAccounts(accountIDs, animated: false)
+        } else {
+            await loadAccounts(list: vc)
+        }
+    }
+    
+    private func loadAccounts(list: StatusActionAccountListCollectionViewController) async {
         let request: Request<[Account]>
         switch actionType {
         case .favorite:
@@ -148,20 +173,45 @@ class StatusActionAccountListViewController: UIViewController, CollectionViewCon
                 }
             }
             
-            accountIDs = accounts.map(\.id)
+            list.addAccounts(accounts.map(\.id), animated: true)
-            
-            var snapshot = dataSource.snapshot()
-            snapshot.appendItems(accounts.map { .account($0.id) }, toSection: .accounts)
-            dataSource.apply(snapshot, animatingDifferences: true) {}
             
         } catch {
             let config = ToastConfiguration(from: error, with: "Error Loading Accounts", in: self) { toast in
                 toast.dismissToast(animated: true)
-                await self.loadAccounts()
+                await self.loadAccounts(list: list)
             }
             self.showToast(configuration: config, animated: true)
         }
     }
+    
+    private func showStatusNotFound() {
+        let notFoundView = StatusNotFoundView(frame: .zero)
+        notFoundView.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(notFoundView)
+        NSLayoutConstraint.activate([
+            notFoundView.leadingAnchor.constraint(equalToSystemSpacingAfter: view.safeAreaLayoutGuide.leadingAnchor, multiplier: 1),
+            view.safeAreaLayoutGuide.trailingAnchor.constraint(equalToSystemSpacingAfter: notFoundView.trailingAnchor, multiplier: 1),
+            notFoundView.centerYAnchor.constraint(equalTo: view.safeAreaLayoutGuide.centerYAnchor),
+        ])
+    }
+    
+    private func showStatusError(_ error: Client.Error) {
+        let config = ToastConfiguration(from: error, with: "Error Loading Status", in: self) { [weak self] toast in
+            toast.dismissToast(animated: true)
+            await self?.loadStatus()
+        }
+        self.showToast(configuration: config, animated: true)
+    }
+
+}
+
+extension StatusActionAccountListViewController {
+    enum State {
+        case unloaded
+        case loading(UIActivityIndicatorView)
+        case displaying(StatusActionAccountListCollectionViewController)
+        case notFound
+    }
 }
 
 extension StatusActionAccountListViewController {
@@ -170,104 +220,12 @@ extension StatusActionAccountListViewController {
     }
 }
 
-extension StatusActionAccountListViewController {
+extension StatusActionAccountListViewController: ToastableViewController {
-    enum Section {
+    var toastScrollView: UIScrollView? {
-        case status
+        if case .displaying(let vc) = state {
-        case accounts
+            return vc.toastScrollView
-    }
+        } else {
-    enum Item: Hashable {
-        case status
-        case account(String)
-    }
-}
-
-extension StatusActionAccountListViewController: UICollectionViewDelegate {
-    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        switch dataSource.itemIdentifier(for: indexPath) {
-        case nil:
-            return
-        case .status:
-            selected(status: statusID, state: statusState.copy())
-        case .account(let id):
-            selected(account: id)
-        }
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {
-        guard let item = dataSource.itemIdentifier(for: indexPath),
-              let cell = collectionView.cellForItem(at: indexPath) else {
             return nil
         }
-        switch item {
-        case .status:
-            return (cell as? TimelineStatusCollectionViewCell)?.contextMenuConfiguration()
-        case .account(let id):
-            return UIContextMenuConfiguration {
-                ProfileViewController(accountID: id, mastodonController: self.mastodonController)
-            } actionProvider: { _ in
-                UIMenu(children: self.actionsForProfile(accountID: id, source: .view(cell)))
-            }
-        }
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating) {
-        MenuPreviewHelper.willPerformPreviewAction(animator: animator, presenter: self)
-    }
-}
-
-extension StatusActionAccountListViewController: UICollectionViewDragDelegate {
-    func collectionView(_ collectionView: UICollectionView, itemsForBeginning session: UIDragSession, at indexPath: IndexPath) -> [UIDragItem] {
-        guard let currentAccountID = mastodonController.accountInfo?.id,
-              let item = dataSource.itemIdentifier(for: indexPath) else {
-            return []
-        }
-        let provider: NSItemProvider
-        switch item {
-        case .status:
-            guard let status = mastodonController.persistentContainer.status(for: statusID) else {
-                return []
-            }
-            provider = NSItemProvider(object: status.url! as NSURL)
-            let activity = UserActivityManager.showConversationActivity(mainStatusID: statusID, accountID: currentAccountID)
-            activity.displaysAuxiliaryScene = true
-            provider.registerObject(activity, visibility: .all)
-        case .account(let id):
-            guard let account = mastodonController.persistentContainer.account(for: id) else {
-                return []
-            }
-            provider = NSItemProvider(object: account.url as NSURL)
-            let activity = UserActivityManager.showProfileActivity(id: account.id, accountID: currentAccountID)
-            activity.displaysAuxiliaryScene = true
-            provider.registerObject(activity, visibility: .all)
-        }
-        return [UIDragItem(itemProvider: provider)]
-    }
-}
-
-extension StatusActionAccountListViewController: TuskerNavigationDelegate {
-    var apiController: MastodonController! { mastodonController }
-}
-
-extension StatusActionAccountListViewController: MenuActionProvider {
-}
-
-extension StatusActionAccountListViewController: StatusCollectionViewCellDelegate {
-    func statusCellNeedsReconfigure(_ cell: StatusCollectionViewCell, animated: Bool, completion: (() -> Void)?) {
-        if let indexPath = collectionView.indexPath(for: cell) {
-            var snapshot = dataSource.snapshot()
-            snapshot.reconfigureItems([dataSource.itemIdentifier(for: indexPath)!])
-            dataSource.apply(snapshot, animatingDifferences: animated, completion: completion)
-        }
-    }
-    
-    func statusCellShowFiltered(_ cell: StatusCollectionViewCell) {
-        fatalError()
-    }
-}
-
-extension StatusActionAccountListViewController: StatusBarTappableViewController {
-    func handleStatusBarTapped(xPosition: CGFloat) -> StatusBarTapActionResult {
-        collectionView.scrollToTop()
-        return .stop
     }
 }

Tusker/Screens/Timeline/TimelineViewController.swift

@@ -146,6 +146,7 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
                 _ = syncPositionIfNecessary(alwaysPrompt: true)
             }
             .store(in: &cancellables)
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
     }
     
     // separate method because InstanceTimelineViewController needs to be able to customize it
@@ -830,6 +831,26 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
         }
     }
     
+    @objc private func handleStatusDeleted(_ notification: Foundation.Notification) {
+        guard let userInfo = notification.userInfo,
+              let accountID = mastodonController.accountInfo?.id,
+              userInfo["accountID"] as? String == accountID,
+              let statusIDs = userInfo["statusIDs"] as? [String] else {
+            return
+        }
+        var snapshot = self.dataSource.snapshot()
+        let toDelete = statusIDs
+            .map { id in
+                Item.status(id: id, collapseState: .unknown, filterState: .unknown)
+            }
+            .filter { item in
+                snapshot.itemIdentifiers.contains(item)
+            }
+        if !toDelete.isEmpty {
+            snapshot.deleteItems(toDelete)
+            self.dataSource.apply(snapshot, animatingDifferences: true)
+        }
+    }
 }
 
 extension TimelineViewController {

Tusker/Screens/Utilities/Previewing.swift

@@ -231,7 +231,7 @@ extension MenuActionProvider {
             }), at: 1)
         }
         
-        var actionsSection: [UIAction] = []
+        var actionsSection: [UIMenuElement] = []
         
         if includeStatusButtonActions {
             actionsSection.insert(createAction(identifier: "reply", title: "Reply", systemImageName: "arrowshape.turn.up.left", handler: { [weak self] (_) in
@@ -257,27 +257,8 @@ extension MenuActionProvider {
             }))
         }
         
-        // only allowing pinning user's own statuses
-        if account.id == status.account.id,
-           mastodonController.instanceFeatures.profilePinnedStatuses {
-            let pinned = status.pinned ?? false
-            toggleableSection.append(createAction(identifier: "pin", title: pinned ? "Unpin from Profile" : "Pin to Profile", systemImageName: pinned ? "pin.slash" : "pin", handler: { [weak self] (_) in
-                guard let self = self else { return }
-                let request = (pinned ? Status.unpin : Status.pin)(status.id)
-                self.mastodonController?.run(request, completion: { [weak self] (response) in
-                    guard let self = self else { return }
-                    switch response {
-                    case .success(let status, _):
-                        self.mastodonController?.persistentContainer.addOrUpdate(status: status)
-                    case .failure(let error):
-                        self.handleError(error, title: "Error \(pinned ? "Unp" :"P")inning")
-                    }
-                })
-            }))
-        }
-        
         if status.poll != nil {
-            actionsSection.insert(createAction(identifier: "refresh", title: "Refresh Poll", systemImageName: "arrow.clockwise", handler: { [weak self] (_) in
+            actionsSection.append(createAction(identifier: "refresh", title: "Refresh Poll", systemImageName: "arrow.clockwise", handler: { [weak self] (_) in
                 guard let mastodonController = self?.mastodonController else { return }
                 let request = Client.getStatus(id: status.id)
                 mastodonController.run(request, completion: { (response) in
@@ -292,11 +273,41 @@ extension MenuActionProvider {
                         self?.handleError(error, title: "Error Refreshing Poll")
                     }
                 })
-            }), at: 0)
+            }))
         }
         
-        // can only report other people's posts
+        if account.id == status.account.id {
-        if account.id != status.account.id {
+            if mastodonController.instanceFeatures.profilePinnedStatuses {
+                let pinned = status.pinned ?? false
+                toggleableSection.append(createAction(identifier: "pin", title: pinned ? "Unpin from Profile" : "Pin to Profile", systemImageName: pinned ? "pin.slash" : "pin", handler: { [weak self] (_) in
+                    guard let self = self else { return }
+                    let request = (pinned ? Status.unpin : Status.pin)(status.id)
+                    self.mastodonController?.run(request, completion: { [weak self] (response) in
+                        guard let self = self else { return }
+                        switch response {
+                        case .success(let status, _):
+                            self.mastodonController?.persistentContainer.addOrUpdate(status: status)
+                        case .failure(let error):
+                            self.handleError(error, title: "Error \(pinned ? "Unp" :"P")inning")
+                        }
+                    })
+                }))
+            }
+            
+            actionsSection.append(UIMenu(title: "Delete Status", image: UIImage(systemName: "trash"), children: [
+                UIAction(title: "Cancel", handler: { _ in }),
+                UIAction(title: "Delete Status", image: UIImage(systemName: "trash"), attributes: .destructive, handler: { [weak self] _ in
+                    guard let self,
+                          let navigationDelegate = self.navigationDelegate else {
+                        return
+                    }
+                    Task { @MainActor in
+                        let service = DeleteStatusService(status: status, mastodonController: mastodonController, presenter: navigationDelegate)
+                        await service.run()
+                    }
+                })
+            ]))
+        } else {
             actionsSection.append(createAction(identifier: "report", title: "Report", systemImageName: "flag", handler: { [weak self] _ in
                 let report = EditedReport(accountID: status.account.id)
                 report.statusIDs = [status.id]

Tusker/Views/StatusNotFoundView.swift

@@ -0,0 +1,60 @@
+//
+//  StatusNotFoundView.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 1/17/23.
+//  Copyright © 2023 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+
+class StatusNotFoundView: UIView {
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        
+        let emoji = UILabel()
+        emoji.font = .systemFont(ofSize: 64)
+        emoji.text = "🤷"
+        
+        let title = UILabel()
+        title.textColor = .secondaryLabel
+        title.font = .preferredFont(forTextStyle: .title1).withTraits(.traitBold)!
+        title.adjustsFontForContentSizeCategory = true
+        title.text = "Not Found"
+        
+        let subtitle = UILabel()
+        subtitle.textColor = .secondaryLabel
+        subtitle.font = .preferredFont(forTextStyle: .body)
+        subtitle.adjustsFontForContentSizeCategory = true
+        subtitle.text = "The post you are looking for may have been deleted, or may not be visible to you."
+        subtitle.numberOfLines = 0
+        subtitle.textAlignment = .center
+        
+        let stack = UIStackView(arrangedSubviews: [
+            emoji,
+            title,
+            subtitle,
+        ])
+        stack.axis = .vertical
+        stack.alignment = .center
+        stack.spacing = 8
+        stack.isAccessibilityElement = true
+        stack.accessibilityLabel = "\(title.text!). \(subtitle.text!)"
+        
+        stack.translatesAutoresizingMaskIntoConstraints = false
+        addSubview(stack)
+        NSLayoutConstraint.activate([
+            stack.leadingAnchor.constraint(equalTo: leadingAnchor),
+            stack.trailingAnchor.constraint(equalTo: trailingAnchor),
+            stack.topAnchor.constraint(equalTo: topAnchor),
+            stack.bottomAnchor.constraint(equalTo: bottomAnchor),
+        ])
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+
+}