Tusker/API/DeleteStatusService.swift

@@ -35,7 +35,8 @@ class DeleteStatusService {
                 reblogIDs = reblogs.map(\.id)
             }
             
-            NotificationCenter.default.post(name: .statusDeleted, object: mastodonController, userInfo: [
+            NotificationCenter.default.post(name: .statusDeleted, object: nil, userInfo: [
+                "accountID": mastodonController.accountInfo!.id,
                 "statusIDs": [status.id] + reblogIDs,
             ])
         } catch {

Tusker/API/FetchStatusService.swift

@@ -36,6 +36,11 @@ class FetchStatusService {
     }
     
     private func handleStatusNotFound() {
+        // 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()
@@ -45,7 +50,8 @@ class FetchStatusService {
             }
         }
         
-        NotificationCenter.default.post(name: .statusDeleted, object: mastodonController, userInfo: [
+        NotificationCenter.default.post(name: .statusDeleted, object: nil, userInfo: [
+            "accountID": accountID,
             "statusIDs": [statusID] + reblogIDs
         ])
     }

Tusker/Screens/Conversation/ConversationViewController.swift

@@ -112,7 +112,7 @@ class ConversationViewController: UIViewController {
         appearance.configureWithDefaultBackground()
         navigationItem.scrollEdgeAppearance = appearance
         
-        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: mastodonController)
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
     }
     
     private func updateVisibilityBarButtonItem() {
@@ -145,6 +145,8 @@ 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],
               case .localID(let mainStatusID) = mode else {
             return

Tusker/Screens/Explore/TrendingStatusesViewController.swift

@@ -102,7 +102,7 @@ class TrendingStatusesViewController: UIViewController, CollectionViewController
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: mastodonController)
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -146,6 +146,8 @@ class TrendingStatusesViewController: UIViewController, CollectionViewController
     
     @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
         }

Tusker/Screens/Local Predicate Statuses List/LocalPredicateStatusesViewController.swift

@@ -107,7 +107,7 @@ class LocalPredicateStatusesViewController: UIViewController, CollectionViewCont
         
         addKeyCommand(MenuController.refreshCommand(discoverabilityTitle: "Refresh \(predicateTitle)"))
         
-        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: mastodonController)
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(managedObjectsDidChange), name: .NSManagedObjectContextObjectsDidChange, object: mastodonController.persistentContainer.viewContext)
     }
     
@@ -205,6 +205,8 @@ class LocalPredicateStatusesViewController: UIViewController, CollectionViewCont
     
     @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
         }

Tusker/Screens/Notifications/NotificationsCollectionViewController.swift

@@ -121,7 +121,7 @@ class NotificationsCollectionViewController: UIViewController, TimelineLikeColle
             self.reapplyFilters(actionsChanged: actionsChanged)
         }
         
-        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: mastodonController)
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
     }
     
     private func createDataSource() -> UICollectionViewDiffableDataSource<Section, Item> {
@@ -257,6 +257,8 @@ class NotificationsCollectionViewController: UIViewController, TimelineLikeColle
     
     @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
         }

Tusker/Screens/Profile/ProfileStatusesViewController.swift

@@ -148,7 +148,7 @@ class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionVie
             self.reapplyFilters(actionsChanged: actionsChanged)
         }
         
-        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: mastodonController)
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
     }
     
     private func createDataSource() -> UICollectionViewDiffableDataSource<Section, Item> {
@@ -376,6 +376,8 @@ 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
         }

Tusker/Screens/Search/MastodonSearchController.swift

@@ -65,13 +65,12 @@ class MastodonSearchController: UISearchController {
             searchText.isEmpty || $0.contains(searchText)
         }))
         
+        // TODO: use default language from preferences
         var langSuggestions = [String]()
-        let defaultLanguage = searchResultsController.mastodonController.accountPreferences.serverDefaultLanguage ?? "en"
+        if searchText.isEmpty || "language:en".contains(searchText) {
-        let languageToken = "language:\(defaultLanguage)"
+            langSuggestions.append("language:en")
-        if searchText.isEmpty || languageToken.contains(searchText) {
-            langSuggestions.append(languageToken)
         }
-        if searchText != defaultLanguage,
+        if searchText != "en",
            let match = languageRegex.firstMatch(in: searchText, range: NSRange(location: 0, length: searchText.utf16.count)) {
             let identifier = (searchText as NSString).substring(with: match.range(at: 1))
             if #available(iOS 16.0, *) {

Tusker/Screens/Search/SearchResultsViewController.swift

@@ -120,7 +120,7 @@ class SearchResultsViewController: UIViewController, CollectionViewController {
 
         userActivity = UserActivityManager.searchActivity(query: nil, accountID: mastodonController.accountInfo!.id)
         
-        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: mastodonController)
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
     }
     
     private func createDataSource() -> UICollectionViewDiffableDataSource<Section, Item> {
@@ -309,6 +309,8 @@ class SearchResultsViewController: UIViewController, CollectionViewController {
     
     @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
         }

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

@@ -84,7 +84,7 @@ class StatusActionAccountListViewController: UIViewController {
 
         view.backgroundColor = .appBackground
         
-        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: mastodonController)
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -99,6 +99,8 @@ class StatusActionAccountListViewController: 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
         }

Tusker/Screens/Status Edit History/StatusEditCollectionViewCell.swift

@@ -91,76 +91,8 @@ class StatusEditCollectionViewCell: UICollectionViewListCell {
         fatalError("init(coder:) has not been implemented")
     }
     
-    // MARK: Accessibility
+    // todo: accessibility
     
-    override var isAccessibilityElement: Bool {
-        get { true }
-        set {}
-    }
-    
-    override var accessibilityAttributedLabel: NSAttributedString? {
-        get {
-            var str: AttributedString = ""
-            if statusState.collapsed ?? false {
-                if !edit.spoilerText.isEmpty {
-                    str += AttributedString(edit.spoilerText)
-                    str += ", "
-                }
-                str += "collapsed"
-            } else {
-                str += AttributedString(contentContainer.contentTextView.attributedText)
-                
-                if edit.attachments.count > 0 {
-                    let includeDescriptions: Bool
-                    switch Preferences.shared.attachmentBlurMode {
-                    case .useStatusSetting:
-                        includeDescriptions = !Preferences.shared.blurMediaBehindContentWarning || edit.spoilerText.isEmpty
-                    case .always:
-                        includeDescriptions = true
-                    case .never:
-                        includeDescriptions = false
-                    }
-                    if includeDescriptions {
-                        if edit.attachments.count == 1 {
-                            let attachment = edit.attachments[0]
-                            let desc = attachment.description?.isEmpty == false ? attachment.description! : "no description"
-                            str += AttributedString(", attachment: \(desc)")
-                        } else {
-                            for (index, attachment) in edit.attachments.enumerated() {
-                                let desc = attachment.description?.isEmpty == false ? attachment.description! : "no description"
-                                str += AttributedString(", attachment \(index + 1): \(desc)")
-                            }
-                        }
-                    } else {
-                        str += AttributedString(", \(edit.attachments.count) attachment\(edit.attachments.count == 1 ? "" : "s")")
-                    }
-                }
-                if edit.poll != nil {
-                    str += ", poll"
-                }
-            }
-            return NSAttributedString(str)
-        }
-        set {}
-    }
-    
-    override var accessibilityHint: String? {
-        get {
-            if statusState.collapsed ?? false {
-                return "Double tap to expand the post."
-            } else {
-                return nil
-            }
-        }
-        set {}
-    }
-    
-    override func accessibilityActivate() -> Bool {
-        if statusState.collapsed ?? false {
-            collapseButtonPressed()
-        }
-        return true
-    }
     
     // MARK: Configure UI
     

Tusker/Screens/Timeline/TimelineViewController.swift

@@ -162,7 +162,7 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
                 }
             }
             .store(in: &cancellables)
-        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: mastodonController)
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: nil)
         
         if userActivity != nil {
             userActivityNeedsUpdate
@@ -943,6 +943,8 @@ 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
         }