CHANGELOG-release.md

@@ -1,34 +1,3 @@
-## 2024.3
-This update includes a number of bugfixes and performance improvements. See below for a list of fixes.
-
-Bugfixes:
-- Fix an issue displaying rich text in certain cases
-- Fix crash when video attachment finishes playing
-- Fix video attachment thumbnails being flipped on Compose screen
-- Fix profile header images being blurry
-- Fix crash when opening push notifications in certain circumstances
-- Fix certain links in profile fields not being tappable
-- Fix gifv playback pausing audio from other apps
-- Fix gifv playback being paused when returning from background
-- Fix badges on gifv attachments not appearing
-- Fix excessive network traffic when opening profile pages
-- Fix controls visibility not matching across attachment gallery pages
-- Fix add hashtag/instance pinned timeline sheet in Customize Timelines dismissing instantly
-- Fix Dynamic Type not applying to status content
-- Fix mention/status push notifications not showing CW
-- Fix sensitive attachment thumbnails being shown in push notifications
-- Fix profile moved overlay visual and VoiceOver issues
-- Fix opening Mastodon remote status links
-- Fix reply author avatar on Compose screen not being pinned to top when scrolling while typing
-- Pleroma/Akkoma: Fix editing attachment descriptions not working
-- Pixelfed/Firefish: Fix error loading certain accounts
-- Pixelfed: Fix error loading relationships and follow/block/etc. actions
-- iPadOS: Fix pointer interactions throughout the app
-- iPadOS: Fix multiple close buttons being added in multi-column interface
-- iPadOS: Fix Cmd+1/etc. removing columns when returning to previous tab
-- iPadOS: Fix multi-column interface not animating for some actions
-- iPadOS: Fix selecting search results always adding new column
-
 ## 2024.2
 This release introduces push notifications as well as an enhanced multi-column interface on iPadOS!
 

CHANGELOG.md

@@ -1,79 +1,6 @@
 # Changelog
 
-## 2024.3 (131)
-Bugfixes:
-- Fix Cmd+3 not correctly switching to Explore tab
-
-## 2024.3 (130)
-Bugfixes:
-- Fix reply author avatar on Compose screen not being pinned to top when scrolling while typing
-- Fix crash when dragging between buttons in reblog confirmation alert
-- Fix potential crash when displaying search results
-- Mac: Fix Post button not displaying on Compose screen
-
-## 2024.3 (129)
-Bugfixes:
-- Fix excessive network traffic on profile pages
-- Fix attachment gallery controls visibility not being synced between pages
-- Fix video attachments not restarting when play pressed while at ends
-- Fix profile field text being misaligned
-- Fix at sign in timeline statuses usernames sometimes clipping
-- Fix add hashtag/instance to Pinned Timelines sheets dismissing immediately when opened
-- Fix for display name being replaced with incorrect user in certain circumstances
-- Fix profile moved overlay view appearing behind avatar/header
-- Fix profile moved view accessibility with VoiceOver
-- Fix mention/status push notifications not showing content warning
-- Fix sensitive attachment thumbnails being shown in push notifications
-- Fix Dynamic Type not applying to status content
-- Fix expand all option in Conversation not transferring when opening ancestors
-- Fix not being able to resolve remote Mastodon status links in Conversation screen
-- Fix status indicator icons overlapping thread links when Dynamic Type is enabled
-
-## 2024.3 (128)
-Bugfixes:
-- Fix selecting poll option playing too much haptic feedback
-- Fix crash when displaying HTML in certain posts
-- Fix gifv playback pausing audio from other apps
-- Fix gifv playback not resuming after returning from background
-- Fix attachment badges not appearing on gifvs
-- iPadOS: Fix poll options not having pointer hover effects
-- iPadOS: Fix haptic feedback not working on new Magic Keyboard
-- iPadOS: Fix scrubbing video with pointer not letting you click to select position
-- iPadOS: Fix multi-column navigation not animating when replacing multiple columns
-
-## 2024.3 (127)
-Bugfixes:
-- Fix Remove Suggestion context menu action missing from Suggested Accounts screen
-- Fix profile header images being blurry
-- Fix dismissing gallery when presented from sheet
-- Fix potential crash in multi-column interface
-- Fix crash when opening push notification while sheet presented
-- Fix being able to block your own domain
-- Fix links in profile fields with other text not being interactable
-- Fix excessive CPU use immediately after app launch
-- Fix timeline failing to load when one status is malformed
-- iPadOS: Fix pointer interactions on conversation main status action buttons
-- iPadOS: Fix multiple close buttons being added in multi-column interface
-- iPadOS: Fix Cmd+1/etc. resetting navigation state when returning to previous column
-- iPadOS: Fix previous sidebar selection losing navigation state in some circumstances
-- iPadOS: Fix profile followers/following buttons not having pointer effect
-- iPadOS: Fix search token suggestions not having pointer effect
-- iPadOS: Fix conversation thread links appearing above avatar during pointer effect
-- iPadOS: Fix multi-column interface not animating scroll when replacing subsequent columns
-- iPadOS: Fix not being able to select text on conversation main status by double-clicking with cursor
-- iPadOS: Fix selecting search result always pushing new column rather than replacing
-- Pixelfed/Firefish: Fix error loading accounts in some circumstances
-- Pixelfed: Fix loading relationships and follow/block/etc. actions not working
-
-## 2024.3 (126)
-Bugfixes:
-- Fix an issue displaying post HTML in certain edge cases
-- Fix crash when video attachment playback ends
-- Fix excessive CPU usage when scrubbing video attachment
-- Fix video attachment thubmnails being flipped on Compose screen
-- Pleroma: Fix editing attachment descriptions not working
-
-## 2024.2 (124)
+## 2024.3 (124)
 Features/Improvements:
 - Add subscription option to Tip Jar
 

NotificationExtension/NotificationService.swift

@@ -63,7 +63,6 @@ class NotificationService: UNNotificationServiceExtension {
         mutableContent.body = notification.body
         mutableContent.userInfo["notificationID"] = notification.notificationID
         mutableContent.userInfo["accountID"] = accountID
-        mutableContent.targetContentIdentifier = accountID
 
         let task = Task {
             await updateNotificationContent(mutableContent, account: account, push: notification)
@@ -122,12 +121,7 @@ class NotificationService: UNNotificationServiceExtension {
         
         let notificationContent: String?
         if let status = notification.status {
-            if notification.kind == .mention || notification.kind == .status,
-               !status.spoilerText.isEmpty {
-                notificationContent = "⚠️ \(status.spoilerText)"
-            } else {
-                notificationContent = NotificationService.textConverter.convert(html: status.content)
-            }
+            notificationContent = NotificationService.textConverter.convert(html: status.content)
         } else if notification.kind == .follow || notification.kind == .followRequest {
             notificationContent = nil
         } else {
@@ -140,9 +134,7 @@ class NotificationService: UNNotificationServiceExtension {
         // We deliberately don't include attachments for other types of notifications that have statuses (favs, etc.)
         // because we risk just fetching the same thing a bunch of times for many senders.
         if notification.kind == .mention || notification.kind == .status || notification.kind == .update,
-           let status = notification.status,
-           !status.sensitive,
-           let attachment = status.attachments.first {
+           let attachment = notification.status?.attachments.first {
             let url = attachment.previewURL ?? attachment.url
             attachmentDataTask = Task {
                 do {

OpenInTusker/Info.plist

@@ -24,8 +24,6 @@
 	<dict>
 		<key>NSExtensionAttributes</key>
 		<dict>
-			<key>NSExtensionServiceRoleType</key>
-			<string>NSExtensionServiceRoleTypeViewer</string>
 			<key>NSExtensionActivationRule</key>
 			<dict>
 				<key>NSExtensionActivationSupportsAttachmentsWithMinCount</key>

Packages/ComposeUI/Sources/ComposeUI/Controllers/AttachmentThumbnailController.swift

@@ -40,7 +40,6 @@ class AttachmentThumbnailController: ViewController {
             case .video, .gifv:
                 let asset = AVURLAsset(url: url)
                 let imageGenerator = AVAssetImageGenerator(asset: asset)
-                imageGenerator.appliesPreferredTrackTransform = true
                 #if os(visionOS)
                 #warning("Use async AVAssetImageGenerator.image(at:)")
                 #else
@@ -92,7 +91,6 @@ class AttachmentThumbnailController: ViewController {
             if type.conforms(to: .movie) {
                 let asset = AVURLAsset(url: url)
                 let imageGenerator = AVAssetImageGenerator(asset: asset)
-                imageGenerator.appliesPreferredTrackTransform = true
                 #if os(visionOS)
                 #warning("Use async AVAssetImageGenerator.image(at:)")
                 #else

Packages/ComposeUI/Sources/ComposeUI/Controllers/ComposeController.swift

@@ -333,12 +333,7 @@ public final class ComposeController: ViewController {
             }
             .toolbar {
                 ToolbarItem(placement: .cancellationAction) { cancelButton }
-                #if targetEnvironment(macCatalyst)
-                ToolbarItem(placement: .topBarTrailing) { draftsButton }
                 ToolbarItem(placement: .confirmationAction) { postButton }
-                #else
-                ToolbarItem(placement: .confirmationAction) { postOrDraftsButton }
-                #endif
                 #if os(visionOS)
                 ToolbarItem(placement: .bottomOrnament) {
                     ControllerView(controller: { controller.toolbarController })
@@ -466,26 +461,18 @@ public final class ComposeController: ViewController {
         }
         
         @ViewBuilder
-        private var postOrDraftsButton: some View {
-            if draft.hasContent || draft.editedStatusID != nil || !controller.config.allowSwitchingDrafts {
-                postButton
-            } else {
-                draftsButton
-            }
-        }
-        
-        private var draftsButton: some View {
-            Button(action: controller.showDrafts) {
-                Text("Drafts")
-            }
-        }
-        
         private var postButton: some View {
-            Button(action: controller.postStatus) {
-                Text(draft.editedStatusID == nil ? "Post" : "Edit")
+            if draft.hasContent || draft.editedStatusID != nil || !controller.config.allowSwitchingDrafts {
+                Button(action: controller.postStatus) {
+                    Text(draft.editedStatusID == nil ? "Post" : "Edit")
+                }
+                .keyboardShortcut(.return, modifiers: .command)
+                .disabled(!controller.postButtonEnabled)
+            } else {
+                Button(action: controller.showDrafts) {
+                    Text("Drafts")
+                }
             }
-            .keyboardShortcut(.return, modifiers: .command)
-            .disabled(!controller.postButtonEnabled)
         }
         
         #if !os(visionOS)

Packages/ComposeUI/Sources/ComposeUI/CoreData/DraftsPersistentContainer.swift

@@ -16,8 +16,6 @@ public class DraftsPersistentContainer: NSPersistentContainer {
     
     public static let shared = DraftsPersistentContainer()
     
-    public static var captureError: ((any Error) -> Void)?
-    
     private static let managedObjectModel: NSManagedObjectModel = {
         let url = Bundle.module.url(forResource: "Drafts", withExtension: "momd")!
         return NSManagedObjectModel(contentsOf: url)!
@@ -41,7 +39,6 @@ public class DraftsPersistentContainer: NSPersistentContainer {
         
         loadPersistentStores { _, error in
             if let error {
-                DraftsPersistentContainer.captureError?(error)
                 fatalError("Loading persistent store: \(error)")
             }
         }

Packages/ComposeUI/Sources/ComposeUI/TextViewCaretScrolling.swift

@@ -39,7 +39,6 @@ extension TextViewCaretScrolling {
         
         let animator = UIViewPropertyAnimator(duration: 0.2, curve: .easeInOut) {
             scrollView.scrollRectToVisible(rectToMakeVisible, animated: false)
-            scrollView.layoutIfNeeded()
         }
         self.caretScrollPositionAnimator = animator
         animator.startAnimation()

Packages/ComposeUI/Sources/ComposeUI/Views/ReplyStatusView.swift

@@ -76,15 +76,13 @@ struct ReplyStatusView: View {
         // once you scroll past the in-reply-to-content, the bottom of the avatar should be pinned to the bottom of the content
         offset = min(offset, maxOffset)
 
-        return AvatarContainerRepresentable(offset: offset) {
-            AvatarImageView(
-                url: status.account.avatar,
-                size: 50,
-                style: controller.config.avatarStyle,
-                fetchAvatar: controller.fetchAvatar
-            )
-        }
-        .frame(width: 50, height: 50)
+        return AvatarImageView(
+            url: status.account.avatar,
+            size: 50,
+            style: controller.config.avatarStyle,
+            fetchAvatar: controller.fetchAvatar
+        )
+        .offset(x: 0, y: offset)
         .accessibilityHidden(true)
     }
 
@@ -96,39 +94,3 @@ private struct DisplayNameHeightPrefKey: PreferenceKey {
         value = nextValue()
     }
 }
-
-// This whole dance is necessary so that the offset can be animatable from
-// UIKit animations, like TextViewCaretScrolling.
-private struct AvatarContainerRepresentable<Content: View>: UIViewControllerRepresentable {
-    let offset: CGFloat
-    @ViewBuilder let content: Content
-
-    func makeUIViewController(context: Context) -> Controller {
-        Controller(host: UIHostingController(rootView: content))
-    }
-    
-    func updateUIViewController(_ uiViewController: Controller, context: Context) {
-        uiViewController.host.rootView = content
-        uiViewController.host.view.transform = CGAffineTransform(translationX: 0, y: offset)
-    }
- 
-    // This extra layer is necessary because applying a transform to the
-    // representable's VC's view doesn't seem to have an effect.
-    class Controller: UIViewController {
-        let host: UIHostingController<Content>
-        
-        init(host: UIHostingController<Content>) {
-            self.host = host
-            super.init(nibName: nil, bundle: nil)
-            addChild(host)
-            host.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-            view.addSubview(host.view)
-            host.view.frame = view.bounds
-            host.didMove(toParent: self)
-        }
-        
-        required init?(coder: NSCoder) {
-            fatalError("init(coder:) has not been implemented")
-        }
-    }
-}

Packages/GalleryVC/Sources/GalleryVC/GalleryDismissAnimationController.swift

@@ -52,22 +52,15 @@ class GalleryDismissAnimationController: NSObject, UIViewControllerAnimatedTrans
             appliedSourceToDestTransform = false
         }
         
-        // Moving `to.view` to the container is necessary when the presenting VC (i.e., `to`)
-        // is in the window's root presentation.
-        // But it breaks when the gallery is presented from a sheet-presented VC--in which case
-        // `to.view` is already in the view hierarchy at this point; and adding it to the
-        // container causees it to be removed when the transition completes.
-        if to.view.superview == nil {
-            to.view.frame = container.bounds
-            container.addSubview(to.view)
-        }
-        
+        to.view.frame = container.bounds
         from.view.frame = container.bounds
-        container.addSubview(from.view)
 
         let content = itemViewController.takeContent()
         content.view.translatesAutoresizingMaskIntoConstraints = true
         content.view.layer.masksToBounds = true
+        
+        container.addSubview(to.view)
+        container.addSubview(from.view)
         container.addSubview(content.view)
         
         content.view.frame = destFrameInContainer

Packages/GalleryVC/Sources/GalleryVC/GalleryItemViewController.swift

@@ -44,7 +44,6 @@ class GalleryItemViewController: UIViewController {
     private(set) var scrollAndZoomEnabled = true
     
     private var scrollViewSizeForLastZoomScaleUpdate: CGSize?
-    
     override var prefersHomeIndicatorAutoHidden: Bool {
         return !controlsVisible
     }
@@ -228,8 +227,6 @@ class GalleryItemViewController: UIViewController {
             updateZoomScale(resetZoom: true)
         }
         centerContent()
-        // Ensure the transform is correct if the controls are hidden and their size changed.
-        setControlsVisible(controlsVisible, animated: false)
     }
     
     override func viewDidAppear(_ animated: Bool) {
@@ -292,12 +289,10 @@ class GalleryItemViewController: UIViewController {
     
     func setControlsVisible(_ visible: Bool, animated: Bool) {
         controlsVisible = visible
-        
         guard let topControlsView,
               let bottomControlsView else {
             return
         }
-        
         func updateControlsViews() {
             topControlsView.transform = CGAffineTransform(translationX: 0, y: visible ? 0 : -topControlsView.bounds.height)
             bottomControlsView.transform = CGAffineTransform(translationX: 0, y: visible ? 0 : bottomControlsView.bounds.height)

Packages/GalleryVC/Sources/GalleryVC/GalleryViewController.swift

@@ -125,8 +125,6 @@ extension GalleryViewController: UIPageViewControllerDataSource {
 extension GalleryViewController: UIPageViewControllerDelegate {
     public func pageViewController(_ pageViewController: UIPageViewController, willTransitionTo pendingViewControllers: [UIViewController]) {
         currentItemViewController.content.galleryContentWillDisappear()
-        let new = pendingViewControllers[0] as! GalleryItemViewController
-        new.setControlsVisible(currentItemViewController.controlsVisible, animated: false)
     }
     
     public func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted completed: Bool) {
@@ -154,21 +152,14 @@ extension GalleryViewController: GalleryItemViewControllerDelegate {
 
 extension GalleryViewController: UIViewControllerTransitioningDelegate {
     public func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        #if os(visionOS)
-        return nil
-        #else
         if let sourceView = galleryDataSource.galleryContentTransitionSourceView(forItemAt: initialItemIndex) {
             return GalleryPresentationAnimationController(sourceView: sourceView)
         } else {
             return nil
         }
-        #endif
     }
     
     public func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        #if os(visionOS)
-        return nil
-        #else
         if let sourceView = galleryDataSource.galleryContentTransitionSourceView(forItemAt: currentItemViewController.itemIndex) {
             let translation: CGPoint?
             let velocity: CGPoint?
@@ -184,6 +175,5 @@ extension GalleryViewController: UIViewControllerTransitioningDelegate {
         } else {
             return nil
         }
-        #endif
     }
 }

Packages/InstanceFeatures/Sources/InstanceFeatures/InstanceFeatures.swift

@@ -157,7 +157,7 @@ public final class InstanceFeatures: ObservableObject {
     }
     
     public var needsEditAttachmentsInSeparateRequest: Bool {
-        instanceType.isPleroma
+        instanceType.isPleroma(.akkoma(nil))
     }
     
     public var composeDirectStatuses: Bool {
@@ -217,18 +217,6 @@ public final class InstanceFeatures: ObservableObject {
         instanceType.isPleroma
     }
     
-    public var muteNotifications: Bool {
-        !instanceType.isPixelfed
-    }
-    
-    public var blockDomains: Bool {
-        !instanceType.isPixelfed
-    }
-    
-    public var hideReblogs: Bool {
-        !instanceType.isPixelfed
-    }
-    
     public init() {
     }
     
@@ -350,14 +338,6 @@ extension InstanceFeatures {
                 return false
             }
         }
-        
-        var isPixelfed: Bool {
-            if case .pixelfed = self {
-                return true
-            } else {
-                return false
-            }
-        }
     }
     
     @_spi(InstanceType) public enum MastodonType {

Packages/Pachyderm/Sources/Pachyderm/Client.swift

@@ -42,7 +42,8 @@ public struct Client: Sendable {
             } else if let date = iso8601.date(from: str) {
                 return date
             } else {
-                throw DecodingError.typeMismatch(Date.self, .init(codingPath: container.codingPath, debugDescription: "unexpected date format: \(str)"))
+//                throw DecodingError.typeMismatch(Date.self, .init(codingPath: container.codingPath, debugDescription: "unexpected date format: \(str)"))
+                return Date(timeIntervalSinceReferenceDate: 0)
             }
         })
         
@@ -204,8 +205,8 @@ public struct Client: Sendable {
         return Request<Account>(method: .get, path: "/api/v1/accounts/verify_credentials")
     }
     
-    public static func getFavourites(range: RequestRange = .default) -> Request<[TryDecode<Status>]> {
-        var request = Request<[TryDecode<Status>]>(method: .get, path: "/api/v1/favourites")
+    public static func getFavourites(range: RequestRange = .default) -> Request<[Status]> {
+        var request = Request<[Status]>(method: .get, path: "/api/v1/favourites")
         request.range = range
         return request
     }
@@ -456,13 +457,14 @@ public struct Client: Sendable {
     }
     
     // MARK: - Timelines
-    public static func getStatuses(timeline: Timeline, range: RequestRange = .default) -> Request<[TryDecode<Status>]> {
+    public static func getStatuses(timeline: Timeline, range: RequestRange = .default) -> Request<[Status]> {
         return timeline.request(range: range)
     }
     
+    
     // MARK: - Bookmarks
-    public static func getBookmarks(range: RequestRange = .default) -> Request<[TryDecode<Status>]> {
-        var request = Request<[TryDecode<Status>]>(method: .get, path: "/api/v1/bookmarks")
+    public static func getBookmarks(range: RequestRange = .default) -> Request<[Status]> {
+        var request = Request<[Status]>(method: .get, path: "/api/v1/bookmarks")
         request.range = range
         return request
     }
@@ -490,7 +492,7 @@ public struct Client: Sendable {
         return Request<[Hashtag]>(method: .get, path: "/api/v1/trends/tags", queryParameters: parameters)
     }
     
-    public static func getTrendingStatuses(limit: Int? = nil, offset: Int? = nil) -> Request<[TryDecode<Status>]> {
+    public static func getTrendingStatuses(limit: Int? = nil, offset: Int? = nil) -> Request<[Status]> {
         var parameters: [Parameter] = []
         if let limit {
             parameters.append("limit" => limit)

Packages/Pachyderm/Sources/Pachyderm/Model/Account.swift

@@ -40,9 +40,8 @@ public final class Account: AccountProtocol, Decodable, Sendable {
         self.displayName = try container.decode(String.self, forKey: .displayName)
         self.locked = try container.decode(Bool.self, forKey: .locked)
         self.createdAt = try container.decode(Date.self, forKey: .createdAt)
-        // some instance types (pixelfed, firefish) seem to sometimes send null for these fields, so just fallback to 0
-        self.followersCount = try container.decodeIfPresent(Int.self, forKey: .followersCount) ?? 0
-        self.followingCount = try container.decodeIfPresent(Int.self, forKey: .followingCount) ?? 0
+        self.followersCount = try container.decode(Int.self, forKey: .followersCount)
+        self.followingCount = try container.decode(Int.self, forKey: .followingCount)
         self.statusesCount = try container.decode(Int.self, forKey: .statusesCount)
         self.note = try container.decode(String.self, forKey: .note)
         self.url = try container.decode(URL.self, forKey: .url)
@@ -95,8 +94,8 @@ public final class Account: AccountProtocol, Decodable, Sendable {
         return request
     }
     
-    public static func getStatuses(_ accountID: String, range: RequestRange = .default, onlyMedia: Bool? = nil, pinned: Bool? = nil, excludeReplies: Bool? = nil, excludeReblogs: Bool? = nil) -> Request<[TryDecode<Status>]> {
-        var request = Request<[TryDecode<Status>]>(method: .get, path: "/api/v1/accounts/\(accountID)/statuses", queryParameters: [
+    public static func getStatuses(_ accountID: String, range: RequestRange = .default, onlyMedia: Bool? = nil, pinned: Bool? = nil, excludeReplies: Bool? = nil, excludeReblogs: Bool? = nil) -> Request<[Status]> {
+        var request = Request<[Status]>(method: .get, path: "/api/v1/accounts/\(accountID)/statuses", queryParameters: [
                 "only_media" => onlyMedia,
                 "pinned" => pinned,
                 "exclude_replies" => excludeReplies,

Packages/Pachyderm/Sources/Pachyderm/Model/Relationship.swift

@@ -27,13 +27,10 @@ public struct Relationship: RelationshipProtocol, Decodable, Sendable {
         self.followedBy = try container.decode(Bool.self, forKey: .followedBy)
         self.blocking = try container.decode(Bool.self, forKey: .blocking)
         self.muting = try container.decode(Bool.self, forKey: .muting)
-        // not supported on pixelfed
-        self.mutingNotifications = try container.decodeIfPresent(Bool.self, forKey: .mutingNotifications) ?? false
+        self.mutingNotifications = try container.decode(Bool.self, forKey: .mutingNotifications)
         self.followRequested = try container.decode(Bool.self, forKey: .followRequested)
-        // not supported on pixelfed
-        self.domainBlocking = try container.decodeIfPresent(Bool.self, forKey: .domainBlocking) ?? false
-        // not supported on pixelfed
-        self.showingReblogs = try container.decodeIfPresent(Bool.self, forKey: .showingReblogs) ?? true
+        self.domainBlocking = try container.decode(Bool.self, forKey: .domainBlocking)
+        self.showingReblogs = try container.decode(Bool.self, forKey: .showingReblogs)
         self.endorsed = try container.decodeIfPresent(Bool.self, forKey: .endorsed) ?? false
     }
     

Packages/Pachyderm/Sources/Pachyderm/Model/SearchResults.swift

@@ -10,7 +10,7 @@ import Foundation
 
 public struct SearchResults: Decodable, Sendable {
     public let accounts: [Account]
-    public let statuses: [TryDecode<Status>]
+    public let statuses: [Status]
     public let hashtags: [Hashtag]
     
     private enum CodingKeys: String, CodingKey {

Packages/Pachyderm/Sources/Pachyderm/Model/Timeline.swift

@@ -32,8 +32,8 @@ extension Timeline {
         }
     }
     
-    func request(range: RequestRange) -> Request<[TryDecode<Status>]> {
-        var request = Request<[TryDecode<Status>]>(method: .get, path: endpoint)
+    func request(range: RequestRange) -> Request<[Status]> {
+        var request: Request<[Status]> = Request<[Status]>(method: .get, path: endpoint)
         if case .public(true) = self {
             request.queryParameters.append("local" => true)
         }

Packages/Pachyderm/Sources/Pachyderm/Utilities/TryDecode.swift

@@ -1,32 +0,0 @@
-//
-//  TryDecode.swift
-//  Pachyderm
-//
-//  Created by Shadowfacts on 6/8/24.
-//
-
-import Foundation
-
-public enum TryDecode<T: Decodable>: Decodable {
-    case error(String)
-    case value(T)
-    
-    public init(from decoder: any Decoder) throws {
-        do {
-            self = .value(try T(from: decoder))
-        } catch {
-            self = .error(error.localizedDescription)
-        }
-    }
-    
-    public var value: T? {
-        if case .value(let value) = self {
-            value
-        } else {
-            nil
-        }
-    }
-}
-
-extension TryDecode: Sendable where T: Sendable {
-}

Packages/PushNotifications/Sources/PushNotifications/PushManagerImpl.swift

@@ -104,7 +104,6 @@ class PushManagerImpl: _PushManager {
             self.subscriptions = await AsyncSequenceAdaptor(wrapping: subscriptions).map {
                 let newEndpoint = await self.endpointURL(deviceToken: token, accountID: $0.accountID)
                 guard newEndpoint != $0.endpoint else {
-                    PushManager.logger.debug("Skipping update of push subscription with endpoint \($0.endpoint, privacy: .public)")
                     return $0
                 }
                 var copy = $0

Tusker.xcodeproj/project.pbxproj

@@ -75,7 +75,6 @@
 		D620483423D3801D008A63EF /* LinkTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D620483323D3801D008A63EF /* LinkTextView.swift */; };
 		D620483623D38075008A63EF /* ContentTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D620483523D38075008A63EF /* ContentTextView.swift */; };
 		D620483823D38190008A63EF /* StatusContentTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D620483723D38190008A63EF /* StatusContentTextView.swift */; };
-		D6210D762C0B924F009BB569 /* RemoveProfileSuggestionService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6210D752C0B924F009BB569 /* RemoveProfileSuggestionService.swift */; };
 		D621733328F1D5ED004C7DB1 /* ReblogService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D621733228F1D5ED004C7DB1 /* ReblogService.swift */; };
 		D62275A824F1CA2800B82A16 /* ComposeReplyContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62275A724F1CA2800B82A16 /* ComposeReplyContentView.swift */; };
 		D623A53D2635F5590095BD04 /* StatusPollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D623A53C2635F5590095BD04 /* StatusPollView.swift */; };
@@ -235,7 +234,6 @@
 		D698F46D2BD0B8310054DB14 /* AnnouncementsCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = D698F46C2BD0B8310054DB14 /* AnnouncementsCollection.swift */; };
 		D698F46F2BD0B8DF0054DB14 /* AddReactionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D698F46E2BD0B8DF0054DB14 /* AddReactionView.swift */; };
 		D698F4712BD0CBAA0054DB14 /* AnnouncementContentTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D698F4702BD0CBAA0054DB14 /* AnnouncementContentTextView.swift */; };
-		D69F26342C4CDFD300FAF761 /* AccountDisplayAndUserNameLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D69F26332C4CDFD300FAF761 /* AccountDisplayAndUserNameLabel.swift */; };
 		D6A00B1D26379FC900316AD4 /* PollOptionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A00B1C26379FC900316AD4 /* PollOptionsView.swift */; };
 		D6A3A380295515550036B6EF /* ProfileHeaderButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3A37F295515550036B6EF /* ProfileHeaderButton.swift */; };
 		D6A3A3822956123A0036B6EF /* TimelinePosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3A3812956123A0036B6EF /* TimelinePosition.swift */; };
@@ -260,7 +258,6 @@
 		D6A6C10F25B62D2400298D0F /* DiskCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A6C10E25B62D2400298D0F /* DiskCache.swift */; };
 		D6A6C11525B62E9700298D0F /* CacheExpiry.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A6C11425B62E9700298D0F /* CacheExpiry.swift */; };
 		D6A6C11B25B63CEE00298D0F /* MemoryCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A6C11A25B63CEE00298D0F /* MemoryCache.swift */; };
-		D6A8D7A52C14DB280007B285 /* PersistentHistoryTokenStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A8D7A42C14DB280007B285 /* PersistentHistoryTokenStore.swift */; };
 		D6AC956723C4347E008C9946 /* MainSceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AC956623C4347E008C9946 /* MainSceneDelegate.swift */; };
 		D6ADB6E828E8C878009924AB /* PublicTimelineDescriptionCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6ADB6E728E8C878009924AB /* PublicTimelineDescriptionCollectionViewCell.swift */; };
 		D6ADB6EA28E91C30009924AB /* TimelineStatusCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6ADB6E928E91C30009924AB /* TimelineStatusCollectionViewCell.swift */; };
@@ -362,7 +359,6 @@
 		D6EBF01523C55C0900AE061B /* UIApplication+Scenes.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EBF01423C55C0900AE061B /* UIApplication+Scenes.swift */; };
 		D6EBF01723C55E0D00AE061B /* UISceneSession+MastodonController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EBF01623C55E0D00AE061B /* UISceneSession+MastodonController.swift */; };
 		D6EE63FB2551F7F60065485C /* StatusCollapseButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EE63FA2551F7F60065485C /* StatusCollapseButton.swift */; };
-		D6EEDE932C3CF21800E10E51 /* AudioSessionCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EEDE922C3CF21800E10E51 /* AudioSessionCoordinator.swift */; };
 		D6F0B12B24A3071C001E48C3 /* MainSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F0B12A24A3071C001E48C3 /* MainSplitViewController.swift */; };
 		D6F0B17524A3A1AA001E48C3 /* MainSidebarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F0B17424A3A1AA001E48C3 /* MainSidebarViewController.swift */; };
 		D6F253CF2AC9F86300806D83 /* SearchTokenSuggestionCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F253CE2AC9F86300806D83 /* SearchTokenSuggestionCollectionViewCell.swift */; };
@@ -510,7 +506,6 @@
 		D620483323D3801D008A63EF /* LinkTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkTextView.swift; sourceTree = "<group>"; };
 		D620483523D38075008A63EF /* ContentTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentTextView.swift; sourceTree = "<group>"; };
 		D620483723D38190008A63EF /* StatusContentTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusContentTextView.swift; sourceTree = "<group>"; };
-		D6210D752C0B924F009BB569 /* RemoveProfileSuggestionService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoveProfileSuggestionService.swift; sourceTree = "<group>"; };
 		D621733228F1D5ED004C7DB1 /* ReblogService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReblogService.swift; sourceTree = "<group>"; };
 		D62275A724F1CA2800B82A16 /* ComposeReplyContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeReplyContentView.swift; sourceTree = "<group>"; };
 		D623A53C2635F5590095BD04 /* StatusPollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusPollView.swift; sourceTree = "<group>"; };
@@ -669,7 +664,6 @@
 		D698F46C2BD0B8310054DB14 /* AnnouncementsCollection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnnouncementsCollection.swift; sourceTree = "<group>"; };
 		D698F46E2BD0B8DF0054DB14 /* AddReactionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddReactionView.swift; sourceTree = "<group>"; };
 		D698F4702BD0CBAA0054DB14 /* AnnouncementContentTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnnouncementContentTextView.swift; sourceTree = "<group>"; };
-		D69F26332C4CDFD300FAF761 /* AccountDisplayAndUserNameLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountDisplayAndUserNameLabel.swift; sourceTree = "<group>"; };
 		D6A00B1C26379FC900316AD4 /* PollOptionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollOptionsView.swift; sourceTree = "<group>"; };
 		D6A3A37F295515550036B6EF /* ProfileHeaderButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileHeaderButton.swift; sourceTree = "<group>"; };
 		D6A3A3812956123A0036B6EF /* TimelinePosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelinePosition.swift; sourceTree = "<group>"; };
@@ -691,7 +685,6 @@
 		D6A6C10E25B62D2400298D0F /* DiskCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiskCache.swift; sourceTree = "<group>"; };
 		D6A6C11425B62E9700298D0F /* CacheExpiry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CacheExpiry.swift; sourceTree = "<group>"; };
 		D6A6C11A25B63CEE00298D0F /* MemoryCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemoryCache.swift; sourceTree = "<group>"; };
-		D6A8D7A42C14DB280007B285 /* PersistentHistoryTokenStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistentHistoryTokenStore.swift; sourceTree = "<group>"; };
 		D6A9E04F29F8917500BEDC7E /* MatchedGeometryPresentation */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = MatchedGeometryPresentation; sourceTree = "<group>"; };
 		D6AC956623C4347E008C9946 /* MainSceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainSceneDelegate.swift; sourceTree = "<group>"; };
 		D6ADB6E728E8C878009924AB /* PublicTimelineDescriptionCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublicTimelineDescriptionCollectionViewCell.swift; sourceTree = "<group>"; };
@@ -806,7 +799,6 @@
 		D6EBF01423C55C0900AE061B /* UIApplication+Scenes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIApplication+Scenes.swift"; sourceTree = "<group>"; };
 		D6EBF01623C55E0D00AE061B /* UISceneSession+MastodonController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UISceneSession+MastodonController.swift"; sourceTree = "<group>"; };
 		D6EE63FA2551F7F60065485C /* StatusCollapseButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusCollapseButton.swift; sourceTree = "<group>"; };
-		D6EEDE922C3CF21800E10E51 /* AudioSessionCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioSessionCoordinator.swift; sourceTree = "<group>"; };
 		D6F0B12A24A3071C001E48C3 /* MainSplitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainSplitViewController.swift; sourceTree = "<group>"; };
 		D6F0B17424A3A1AA001E48C3 /* MainSidebarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainSidebarViewController.swift; sourceTree = "<group>"; };
 		D6F253CE2AC9F86300806D83 /* SearchTokenSuggestionCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchTokenSuggestionCollectionViewCell.swift; sourceTree = "<group>"; };
@@ -1057,7 +1049,6 @@
 				D608470E2A245D1F00C17380 /* ActiveInstance.swift */,
 				D60E2F2D244248BF005F8713 /* MastodonCachePersistentStore.swift */,
 				D6B936702829F72900237D0E /* NSManagedObjectContext+Helpers.swift */,
-				D6A8D7A42C14DB280007B285 /* PersistentHistoryTokenStore.swift */,
 			);
 			path = CoreData;
 			sourceTree = "<group>";
@@ -1482,9 +1473,7 @@
 		D6BED1722126661300F02DA0 /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				D6D79F562A1160B800AB2315 /* AccountDisplayNameLabel.swift */,
 				D6B4A4FE2506B81A000C81C1 /* AccountDisplayNameView.swift */,
-				D69F26332C4CDFD300FAF761 /* AccountDisplayAndUserNameLabel.swift */,
 				D68E6F5E253C9B2D001A1B4C /* BaseEmojiLabel.swift */,
 				D6ADB6EF28ED1F25009924AB /* CachedImageView.swift */,
 				D6895DC328D65342006341DA /* ConfirmReblogStatusPreviewView.swift */,
@@ -1518,6 +1507,7 @@
 				D641C78B213DD92F004B4513 /* Profile Header */,
 				D641C78A213DD926004B4513 /* Status */,
 				D64AAE8F26C80DB600FC57FB /* Toast */,
+				D6D79F562A1160B800AB2315 /* AccountDisplayNameLabel.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -1612,7 +1602,6 @@
 				D691296D2BA75ACF005C58ED /* PrivacyInfo.xcprivacy */,
 				D671A6BE299DA96100A81FEA /* Tusker-Bridging-Header.h */,
 				D6D4DDCF212518A000E1C4BB /* AppDelegate.swift */,
-				D6EEDE922C3CF21800E10E51 /* AudioSessionCoordinator.swift */,
 				D6D79F582A13293200AB2315 /* BackgroundManager.swift */,
 				D69261262BB3BA610023152C /* Box.swift */,
 				D61F75B6293C119700C0B37F /* Filterer.swift */,
@@ -1768,7 +1757,6 @@
 				D6DD8FFC298495A8002AD3FD /* LogoutService.swift */,
 				D6D79F252A0C8D2700AB2315 /* FetchStatusSourceService.swift */,
 				D630C3CB2BC5FD4600208903 /* GetAuthorizationTokenService.swift */,
-				D6210D752C0B924F009BB569 /* RemoveProfileSuggestionService.swift */,
 			);
 			path = API;
 			sourceTree = "<group>";
@@ -2153,7 +2141,6 @@
 				D61F759B29384F9C00C0B37F /* FilterMO.swift in Sources */,
 				D68FEC4F232C5BC300C84F23 /* SegmentedPageViewController.swift in Sources */,
 				D6934F342BA8D65A002B1C8D /* ImageGalleryDataSource.swift in Sources */,
-				D6EEDE932C3CF21800E10E51 /* AudioSessionCoordinator.swift in Sources */,
 				D6C4532D2BCB86AC00E26A0E /* AppearancePrefsView.swift in Sources */,
 				D64AAE9126C80DC600FC57FB /* ToastView.swift in Sources */,
 				D6BC74862AFC4772000DD603 /* SuggestedProfileCardView.swift in Sources */,
@@ -2360,7 +2347,6 @@
 				D65B4B542971F71D00DABDFB /* EditedReport.swift in Sources */,
 				D62D67C52A97D8CD00167EE2 /* MultiColumnNavigationController.swift in Sources */,
 				D6A6C11525B62E9700298D0F /* CacheExpiry.swift in Sources */,
-				D69F26342C4CDFD300FAF761 /* AccountDisplayAndUserNameLabel.swift in Sources */,
 				D67C57AF21E28EAD00C3118B /* Array+Uniques.swift in Sources */,
 				D68A76F129539116001DA1B3 /* FlipView.swift in Sources */,
 				D6945C3223AC4D36005C403C /* HashtagTimelineViewController.swift in Sources */,
@@ -2376,7 +2362,6 @@
 				D698F46D2BD0B8310054DB14 /* AnnouncementsCollection.swift in Sources */,
 				D61F75AF293AF50C00C0B37F /* EditedFilter.swift in Sources */,
 				D691771929A7B8820054D7EF /* ProfileHeaderMovedOverlayView.swift in Sources */,
-				D6210D762C0B924F009BB569 /* RemoveProfileSuggestionService.swift in Sources */,
 				D61F75B9293C15A000C0B37F /* ZeroHeightCollectionViewCell.swift in Sources */,
 				D68232F72464F4FD00325FB8 /* ComposeDrawingViewController.swift in Sources */,
 				04586B4122B2FFB10021BD04 /* PreferencesView.swift in Sources */,
@@ -2423,7 +2408,6 @@
 				D68A76E829527884001DA1B3 /* PinnedTimelinesView.swift in Sources */,
 				D690797324A4EF9700023A34 /* UIBezierPath+Helpers.swift in Sources */,
 				D6D12B5A292D684600D528E1 /* AccountListViewController.swift in Sources */,
-				D6A8D7A52C14DB280007B285 /* PersistentHistoryTokenStore.swift in Sources */,
 				D693DE5723FE1A6A0061E07D /* EnhancedNavigationViewController.swift in Sources */,
 				D646DCDC2A081CF10059ECEB /* StatusUpdatedNotificationCollectionViewCell.swift in Sources */,
 			);
@@ -2688,8 +2672,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				"ASSETCATALOG_COMPILER_APPICON_NAME[sdk=*]" = AppIcon;
-				"ASSETCATALOG_COMPILER_APPICON_NAME[sdk=xros*]" = "AppIcon-vision";
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -2992,8 +2975,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				"ASSETCATALOG_COMPILER_APPICON_NAME[sdk=*]" = AppIcon;
-				"ASSETCATALOG_COMPILER_APPICON_NAME[sdk=xros*]" = "AppIcon-vision";
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -3024,8 +3006,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				"ASSETCATALOG_COMPILER_APPICON_NAME[sdk=*]" = AppIcon;
-				"ASSETCATALOG_COMPILER_APPICON_NAME[sdk=xros*]" = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -3260,7 +3241,7 @@
 			repositoryURL = "https://git.shadowfacts.net/shadowfacts/HTMLStreamer.git";
 			requirement = {
 				kind = exactVersion;
-				version = 0.3.0;
+				version = 0.2.3;
 			};
 		};
 		D63CC700290EC0B8000E19DE /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {

Tusker/API/RemoveProfileSuggestionService.swift

@@ -1,39 +0,0 @@
-//
-//  RemoveProfileSuggestionService.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 6/1/24.
-//  Copyright © 2024 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-import Pachyderm
-
-@MainActor
-class RemoveProfileSuggestionService {
-    private let accountID: String
-    private let mastodonController: MastodonController
-    private let presenter: any TuskerNavigationDelegate
-    private let completionHandler: @MainActor () -> Void
-    
-    init(accountID: String, mastodonController: MastodonController, presenter: any TuskerNavigationDelegate, completionHandler: @MainActor @escaping () -> Void) {
-        self.accountID = accountID
-        self.mastodonController = mastodonController
-        self.presenter = presenter
-        self.completionHandler = completionHandler
-    }
-    
-    func run() async {
-        let req = Suggestion.remove(accountID: accountID)
-        do {
-            _ = try await mastodonController.run(req)
-            completionHandler()
-        } catch {
-            let config = ToastConfiguration(from: error, with: "Error Removing Suggestion", in: presenter) { toast in
-                toast.dismissToast(animated: true)
-                await self.run()
-            }
-            self.presenter.showToast(configuration: config, animated: true)
-        }
-    }
-}

Tusker/AppDelegate.swift

@@ -56,9 +56,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         
         // make sure the persistent container is initialized on the main thread
         // otherwise initializing it on the background thread can deadlock with accessing it on the main thread elsewhere
-        #if canImport(Sentry)
-        DraftsPersistentContainer.captureError = { SentrySDK.capture(error: $0) }
-        #endif
         _ = DraftsPersistentContainer.shared
         
         DispatchQueue.global(qos: .userInitiated).async {
@@ -188,8 +185,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 let mastodonController = MastodonController.getForAccount(account)
                 do {
                     let result = try await mastodonController.updatePushSubscription(subscription: $0)
-                    PushManager.logger.info("Updated push subscription \(result.id, privacy: .public) on \(mastodonController.instanceURL) with endpoint \($0.endpoint, privacy: .public)")
-                    PushManager.logger.debug("New push subscription: \(String(describing: result))")
+                    PushManager.logger.debug("Updated push subscription \(result.id) on \(mastodonController.instanceURL)")
                     return true
                 } catch {
                     PushManager.logger.error("Error updating push subscription: \(String(describing: error))")
@@ -293,18 +289,12 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
             // if the scene is already active, then we animate the account switching if necessary
             delegate.activateAccount(account, animated: scene.activationState == .foregroundActive)
             
-            rootViewController.select(route: .notifications, animated: false) {
-                let vc = NotificationLoadingViewController(notificationID: notificationID, mastodonController: mastodonController)
-                rootViewController.getNavigationController().pushViewController(vc, animated: false)
-            }
+            rootViewController.select(route: .notifications, animated: false)
+            let vc = NotificationLoadingViewController(notificationID: notificationID, mastodonController: mastodonController)
+            rootViewController.getNavigationController().pushViewController(vc, animated: false)
         } else {
             let activity = UserActivityManager.showNotificationActivity(id: notificationID, accountID: accountID)
-            if #available(iOS 17.0, *) {
-                let request = UISceneSessionActivationRequest(userActivity: activity)
-                UIApplication.shared.activateSceneSession(for: request)
-            } else {
-                UIApplication.shared.requestSceneSessionActivation(nil, userActivity: activity, options: nil)
-            }
+            UIApplication.shared.requestSceneSessionActivation(nil, userActivity: activity, options: nil)
         }
         completionHandler()
     }

Tusker/Assets.xcassets/AppIcon-vision.solidimagestack/Back.solidimagestacklayer/Content.imageset/Contents.json

@@ -1,13 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "back.png",
-      "idiom" : "vision",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Tusker/Assets.xcassets/AppIcon-vision.solidimagestack/Back.solidimagestacklayer/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Tusker/Assets.xcassets/AppIcon-vision.solidimagestack/Contents.json

@@ -1,14 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "layers" : [
-    {
-      "filename" : "Front.solidimagestacklayer"
-    },
-    {
-      "filename" : "Back.solidimagestacklayer"
-    }
-  ]
-}

Tusker/Assets.xcassets/AppIcon-vision.solidimagestack/Front.solidimagestacklayer/Content.imageset/Contents.json

@@ -1,13 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "front.png",
-      "idiom" : "vision",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Tusker/Assets.xcassets/AppIcon-vision.solidimagestack/Front.solidimagestacklayer/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Tusker/AudioSessionCoordinator.swift

@@ -1,92 +0,0 @@
-//
-//  AudioSessionCoordinator.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 7/8/24.
-//  Copyright © 2024 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-import AVFoundation
-
-final class AudioSessionCoordinator {
-    static let shared = AudioSessionCoordinator()
-    
-    private init() {}
-    
-    private let queue = DispatchQueue(label: "AudioSessionCoordinator", qos: .userInitiated)
-    
-    private var videoCount = 0
-    private var gifvCount = 0
-    
-    func beginPlayback(mode: Mode, completionHandler: (() -> Void)? = nil) -> Token {
-        let token = Token(mode: mode)
-        queue.async {
-            switch mode {
-            case .video:
-                self.videoCount += 1
-            case .gifv:
-                self.gifvCount += 1
-            }
-            self.update(completionHandler: completionHandler)
-        }
-        return token
-    }
-    
-    func endPlayback(token: Token, completionHandler: (() -> Void)? = nil) {
-        // mark the token as consumed, so when it's deinited we don't try to end again
-        token.consumed = true
-        // the enqueued block can't retain token, since it may be being dealloc'd right now
-        let mode = token.mode
-        queue.async {
-            switch mode {
-            case .video:
-                self.videoCount -= 1
-            case .gifv:
-                self.gifvCount -= 1
-            }
-            self.update(completionHandler: completionHandler)
-        }
-    }
-    
-    private func update(completionHandler: (() -> Void)?) {
-        let currentCategory = AVAudioSession.sharedInstance().category
-        if videoCount > 0 {
-            try? AVAudioSession.sharedInstance().setCategory(.playback)
-            try? AVAudioSession.sharedInstance().setActive(true)
-        } else if gifvCount > 0 {
-            // if we're transitioning from video to gifv, fully deactivate first
-            // in order to let other (music) apps resume, then activate with the
-            // ambient category to "mix" with others
-            if currentCategory == .playback {
-                try? AVAudioSession.sharedInstance().setActive(false, options: .notifyOthersOnDeactivation)
-            }
-            // only gifv modes requested, allow mixing with others
-            try? AVAudioSession.sharedInstance().setCategory(.ambient)
-            try? AVAudioSession.sharedInstance().setActive(true)
-        } else {
-            try? AVAudioSession.sharedInstance().setActive(false, options: .notifyOthersOnDeactivation)
-        }
-        completionHandler?()
-    }
-    
-    final class Token {
-        let mode: Mode
-        fileprivate var consumed = false
-        
-        init(mode: Mode) {
-            self.mode = mode
-        }
-        
-        deinit {
-            if !consumed {
-                AudioSessionCoordinator.shared.endPlayback(token: self)
-            }
-        }
-    }
-    
-    enum Mode {
-        case video
-        case gifv
-    }
-}

Tusker/Caching/ImageCache.swift

@@ -96,7 +96,7 @@ final class ImageCache: @unchecked Sendable {
     }
     
     private func fetch(url: URL) async -> FetchResult {
-        guard let (data, _) = try? await URLSession.appDefault.data(from: url) else {
+        guard let (data, _) = try? await URLSession.shared.data(from: url) else {
             return .none
         }
         guard let image = UIImage(data: data) else {

Tusker/CoreData/MastodonCachePersistentStore.swift

@@ -48,6 +48,8 @@ class MastodonCachePersistentStore: NSPersistentCloudKitContainer {
         return context
     }()
     
+    private var lastRemoteChangeToken: NSPersistentHistoryToken?
+    
     // TODO: consider sending managed objects through this to avoid re-fetching things unnecessarily
     // would need to audit existing uses to make sure everything happens on the main thread
     // and when updating things on the background context would need to switch to main, refetch, and then publish
@@ -188,10 +190,8 @@ class MastodonCachePersistentStore: NSPersistentCloudKitContainer {
         viewContext.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
         viewContext.name = "View"
         
-        if accountInfo != nil {
-            NotificationCenter.default.addObserver(self, selector: #selector(managedObjectsDidChange), name: .NSManagedObjectContextObjectsDidChange, object: viewContext)
-            NotificationCenter.default.addObserver(self, selector: #selector(remoteChanges), name: .NSPersistentStoreRemoteChange, object: persistentStoreCoordinator)
-        }
+        NotificationCenter.default.addObserver(self, selector: #selector(managedObjectsDidChange), name: .NSManagedObjectContextObjectsDidChange, object: viewContext)
+        NotificationCenter.default.addObserver(self, selector: #selector(remoteChanges), name: .NSPersistentStoreRemoteChange, object: persistentStoreCoordinator)
     }
     
     func save(context: NSManagedObjectContext) {
@@ -521,82 +521,58 @@ class MastodonCachePersistentStore: NSPersistentCloudKitContainer {
     }
     
     @objc private func remoteChanges(_ notification: Foundation.Notification) {
-        guard let accountInfo,
-              let token = notification.userInfo?[NSPersistentHistoryTokenKey] as? NSPersistentHistoryToken else {
+        guard let token = notification.userInfo?[NSPersistentHistoryTokenKey] as? NSPersistentHistoryToken else {
             return
         }
-        PersistentHistoryTokenStore.token(for: accountInfo) { lastToken in
-            self.remoteChangesBackgroundContext.perform {
-                defer {
-                    PersistentHistoryTokenStore.setToken(token, for: accountInfo)
-                }
-                let transactions: [NSPersistentHistoryTransaction]
-                do {
-                    let req = NSPersistentHistoryChangeRequest.fetchHistory(after: lastToken)
-                    if let result = try self.remoteChangesBackgroundContext.execute(req) as? NSPersistentHistoryResult {
-                        transactions = result.result as? [NSPersistentHistoryTransaction] ?? []
-                    } else {
-                        logger.error("Unexpectedly non-NSPersistentHistoryResult")
-                        return
+        remoteChangesBackgroundContext.perform {
+            defer {
+                self.lastRemoteChangeToken = token
+            }
+            let req = NSPersistentHistoryChangeRequest.fetchHistory(after: self.lastRemoteChangeToken)
+            if let result = try? self.remoteChangesBackgroundContext.execute(req) as? NSPersistentHistoryResult,
+               let transactions = result.result as? [NSPersistentHistoryTransaction],
+               !transactions.isEmpty {
+                var changedHashtags = false
+                var changedInstances = false
+                var changedTimelinePositions = Set<NSManagedObjectID>()
+                var changedAccountPrefs = false
+                outer: for transaction in transactions {
+                    for change in transaction.changes ?? [] {
+                        if change.changedObjectID.entity.name == "SavedHashtag" {
+                            changedHashtags = true
+                        } else if change.changedObjectID.entity.name == "SavedInstance" {
+                            changedInstances = true
+                        } else if change.changedObjectID.entity.name == "TimelinePosition" {
+                            changedTimelinePositions.insert(change.changedObjectID)
+                        } else if change.changedObjectID.entity.name == "AccountPreferences" {
+                            changedAccountPrefs = true
+                        }
                     }
-                } catch {
-                    logger.error("Unable to fetch persistent history results: \(String(describing: error), privacy: .public)")
-                    return
                 }
-                if !transactions.isEmpty {
-                    self.processPersistentHistoryTransactions(transactions)
+                // Can't capture vars in concurrently-executing closure
+                let hashtags = changedHashtags
+                let instances = changedInstances
+                let timelinePositions = changedTimelinePositions
+                let accountPrefs = changedAccountPrefs
+                DispatchQueue.main.async {
+                    if hashtags {
+                        NotificationCenter.default.post(name: .savedHashtagsChanged, object: nil)
+                    }
+                    if instances {
+                        NotificationCenter.default.post(name: .savedInstancesChanged, object: nil)
+                    }
+                    for id in timelinePositions {
+                        guard let timelinePosition = try? self.viewContext.existingObject(with: id) as? TimelinePosition else {
+                            continue
+                        }
+                        // the kvo observer that clears the LazilyDecoding cache doesn't always fire on remote changes, so do it manually
+                        timelinePosition.changedRemotely()
+                        NotificationCenter.default.post(name: .timelinePositionChanged, object: timelinePosition)
+                    }
+                    if accountPrefs {
+                        NotificationCenter.default.post(name: .accountPreferencesChangedRemotely, object: nil)
+                    }
                 }
-                
-                // NB: We deliberately do not purge old persistent history.
-                // Doing so causes the CoreData+CloudKit integration to replay all of
-                // the server's changes on initialization, which takes a long time
-                // and produces a bunch of intermediate UI updates we don't want.
-            }
-        }
-    }
-    
-    private func processPersistentHistoryTransactions(_ transactions: [NSPersistentHistoryTransaction]) {
-        logger.info("Processing \(transactions.count) persistent history transactions")
-        var changedHashtags = false
-        var changedInstances = false
-        var changedTimelinePositions = Set<NSManagedObjectID>()
-        var changedAccountPrefs = false
-        outer: for transaction in transactions {
-            logger.info("Processing \(transaction.changes?.count ?? 0) changes in transaction")
-            for change in transaction.changes ?? [] {
-                if change.changedObjectID.entity.name == "SavedHashtag" {
-                    changedHashtags = true
-                } else if change.changedObjectID.entity.name == "SavedInstance" {
-                    changedInstances = true
-                } else if change.changedObjectID.entity.name == "TimelinePosition" {
-                    changedTimelinePositions.insert(change.changedObjectID)
-                } else if change.changedObjectID.entity.name == "AccountPreferences" {
-                    changedAccountPrefs = true
-                }
-            }
-        }
-        // Can't capture vars in concurrently-executing closure
-        let hashtags = changedHashtags
-        let instances = changedInstances
-        let timelinePositions = changedTimelinePositions
-        let accountPrefs = changedAccountPrefs
-        DispatchQueue.main.async {
-            if hashtags {
-                NotificationCenter.default.post(name: .savedHashtagsChanged, object: nil)
-            }
-            if instances {
-                NotificationCenter.default.post(name: .savedInstancesChanged, object: nil)
-            }
-            for id in timelinePositions {
-                guard let timelinePosition = try? self.viewContext.existingObject(with: id) as? TimelinePosition else {
-                    continue
-                }
-                // the kvo observer that clears the LazilyDecoding cache doesn't always fire on remote changes, so do it manually
-                timelinePosition.changedRemotely()
-                NotificationCenter.default.post(name: .timelinePositionChanged, object: timelinePosition)
-            }
-            if accountPrefs {
-                NotificationCenter.default.post(name: .accountPreferencesChangedRemotely, object: nil)
             }
         }
     }

Tusker/CoreData/PersistentHistoryTokenStore.swift

@@ -1,47 +0,0 @@
-//
-//  PersistentHistoryTokenStore.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 6/8/24.
-//  Copyright © 2024 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-import CoreData
-import UserAccounts
-
-struct PersistentHistoryTokenStore {
-    private static let queue = DispatchQueue(label: "PersistentHistoryTokenStore")
-    
-    private static var tokens: [String: NSPersistentHistoryToken] = (try? load()) ?? [:]
-    
-    private static let applicationSupportDirectory = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first!
-    private static let storeURL = applicationSupportDirectory.appendingPathComponent("PersistentHistoryTokenStore.plist")
-    
-    private static func load() throws -> [String: NSPersistentHistoryToken]? {
-        let data = try Data(contentsOf: storeURL)
-        let unarchived = try NSKeyedUnarchiver.unarchivedObject(ofClasses: [NSDictionary.self, NSString.self, NSPersistentHistoryToken.self], from: data)
-        return unarchived as? [String: NSPersistentHistoryToken]
-    }
-    
-    private static func save() throws {
-        let data = try NSKeyedArchiver.archivedData(withRootObject: tokens as [NSString: NSPersistentHistoryToken], requiringSecureCoding: true)
-        try data.write(to: PersistentHistoryTokenStore.storeURL)
-    }
-
-    static func token(for account: UserAccountInfo, completion: @escaping (NSPersistentHistoryToken?) -> Void) {
-        queue.async {
-            completion(tokens[account.id])
-        }
-    }
-    
-    static func setToken(_ token: NSPersistentHistoryToken, for account: UserAccountInfo) {
-        queue.async {
-            tokens[account.id] = token
-            try? save()
-        }
-    }
-    
-    private init() {}
-
-}

Tusker/HTMLConverter.swift

@@ -25,14 +25,8 @@ class HTMLConverter {
     
     private let converter: AttributedStringConverter<Callbacks>
     
-    init(font: UIFont, monospaceFont: UIFont, fontMetrics: UIFontMetrics, color: UIColor, paragraphStyle: NSParagraphStyle) {
-        let config = AttributedStringConverterConfiguration(
-            font: font,
-            monospaceFont: monospaceFont,
-            fontMetrics: fontMetrics,
-            color: color,
-            paragraphStyle: paragraphStyle
-        )
+    init(font: UIFont, monospaceFont: UIFont, color: UIColor, paragraphStyle: NSParagraphStyle) {
+        let config = AttributedStringConverterConfiguration(font: font, monospaceFont: monospaceFont, color: color, paragraphStyle: paragraphStyle)
         self.converter = AttributedStringConverter(configuration: config)
     }
    

Tusker/MenuController.swift

@@ -32,7 +32,7 @@ struct MenuController {
     static let sidebarItemKeyCommands: [UIKeyCommand] = [
         sidebarCommand(item: .tab(.timelines), command: "1", action: #selector(MainSplitViewController.handleSidebarCommandTimelines)),
         sidebarCommand(item: .tab(.notifications), command: "2", action: #selector(MainSplitViewController.handleSidebarCommandNotifications)),
-        sidebarCommand(item: .tab(.explore), command: "3", action: #selector(MainSplitViewController.handleSidebarCommandExplore)),
+        sidebarCommand(item: .explore, command: "3", action: #selector(MainSplitViewController.handleSidebarCommandExplore)),
         sidebarCommand(item: .bookmarks, command: "4", action: #selector(MainSplitViewController.handleSidebarCommandBookmarks)),
         sidebarCommand(item: .tab(.myProfile), command: "5", action: #selector(MainSplitViewController.handleSidebarCommandMyProfile)),
     ]

Tusker/Scenes/AuxiliarySceneDelegate.swift

@@ -32,9 +32,8 @@ class AuxiliarySceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDel
         }
         launchActivity = activity
         
-        scene.activationConditions.canActivateForTargetContentIdentifierPredicate = NSPredicate(value: false)
-
         let account: UserAccountInfo
+        
         if let activityAccount = UserActivityManager.getAccount(from: activity) {
             account = activityAccount
         } else if let mostRecent = UserAccountsManager.shared.getMostRecentAccount() {

Tusker/Scenes/ComposeSceneDelegate.swift

@@ -29,8 +29,6 @@ class ComposeSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDeleg
             return
         }
         
-        scene.activationConditions.canActivateForTargetContentIdentifierPredicate = NSPredicate(value: false)
-
         let account: UserAccountInfo
         let controller: MastodonController
         let draft: Draft?

Tusker/Scenes/MainSceneDelegate.swift

@@ -83,9 +83,7 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
         } else {
             context = ActiveAccountUserActivityHandlingContext(isHandoff: true, root: rootViewController!)
         }
-        Task(priority: .userInitiated) {
-            _ = await userActivity.handleResume(manager: UserActivityManager(scene: scene as! UIWindowScene, context: context))
-        }
+        _ = userActivity.handleResume(manager: UserActivityManager(scene: scene as! UIWindowScene, context: context))
     }
     
     func windowScene(_ windowScene: UIWindowScene, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler: @escaping (Bool) -> Void) {
@@ -193,10 +191,8 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
             
             if let activity = launchActivity {
                 func doRestoreActivity(context: UserActivityHandlingContext) {
-                    Task(priority: .userInitiated) {
-                        _ = await activity.handleResume(manager: UserActivityManager(scene: window!.windowScene!, context: context))
-                        context.finalize(activity: activity)
-                    }
+                    _ = activity.handleResume(manager: UserActivityManager(scene: window!.windowScene!, context: context))
+                    context.finalize(activity: activity)
                 }
                 if activity.isStateRestorationActivity {
                     doRestoreActivity(context: StateRestorationUserActivityHandlingContext(root: rootViewController!))
@@ -229,8 +225,7 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
             window!.windowScene!.title = account.instanceURL.host!
         }
         
-        window!.windowScene!.activationConditions.prefersToActivateForTargetContentIdentifierPredicate = NSPredicate(format: "self == %@", account.id)
-        
+        let newRoot = createAppUI()
         if let container = window?.rootViewController as? AccountSwitchingContainerViewController {
             let direction: AccountSwitchingContainerViewController.AnimationDirection
             if animated,
@@ -240,9 +235,9 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
             } else {
                 direction = .none
             }
-            container.setRoot(createAppUI, for: account, animating: direction)
+            container.setRoot(newRoot, for: account, animating: direction)
         } else {
-            window!.rootViewController = AccountSwitchingContainerViewController(root: createAppUI(), for: account)
+            window!.rootViewController = AccountSwitchingContainerViewController(root: newRoot, for: account)
         }
     }
     
@@ -253,9 +248,6 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
         LogoutService(accountInfo: account).run()
         if UserAccountsManager.shared.onboardingComplete {
             activateAccount(UserAccountsManager.shared.accounts.first!, animated: false)
-            if let container = window?.rootViewController as? AccountSwitchingContainerViewController {
-                container.removeAccount(account)
-            }
         } else {
             window!.rootViewController = createOnboardingUI()
         }

Tusker/Screens/Announcements/AddReactionView.swift

@@ -64,15 +64,9 @@ struct AddReactionView: View {
             }
             .searchable(text: $query, placement: .navigationBarDrawer(displayMode: .always))
             .searchPresentationToolbarBehaviorIfAvailable()
-            #if os(visionOS)
-            .onChange(of: query) {
-                updateFilteredEmojis()
-            }
-            #else
             .onChange(of: query) { _ in
                 updateFilteredEmojis()
             }
-            #endif
             .navigationTitle("Add Reaction")
             .navigationBarTitleDisplayMode(.inline)
             .toolbar {
@@ -172,7 +166,6 @@ private struct AddReactionButton<Label: View>: View {
 
 private extension View {
     @available(iOS, obsoleted: 16.0)
-    @available(visionOS 1.0, *)
     @ViewBuilder
     func mediumPresentationDetentIfAvailable() -> some View {
         if #available(iOS 16.0, *) {
@@ -183,7 +176,6 @@ private extension View {
     }
     
     @available(iOS, obsoleted: 17.1)
-    @available(visionOS 1.0, *)
     @ViewBuilder
     func searchPresentationToolbarBehaviorIfAvailable() -> some View {
         if #available(iOS 17.1, *) {

Tusker/Screens/Conversation/ConversationCollectionViewController.swift

@@ -364,9 +364,7 @@ extension ConversationCollectionViewController: UICollectionViewDelegate {
                 conv.showStatusesAutomatically = showStatusesAutomatically
                 show(conv)
             } else {
-                let conv = ConversationViewController(for: id, state: state.copy(), mastodonController: mastodonController)
-                conv.showStatusesAutomatically = showStatusesAutomatically
-                show(conv)
+                selected(status: id, state: state.copy())
             }
         case .expandThread(childThreads: let childThreads, inline: _):
             let indexPathBeforeExpandThread = IndexPath(row: indexPath.row - 1, section: indexPath.section)

Tusker/Screens/Conversation/ConversationViewController.swift

@@ -221,16 +221,10 @@ class ConversationViewController: UIViewController {
                 completionHandler(nil)
             }
         }
-        if isLikelyMastodonRemoteStatus(url: url) {
-            var request = URLRequest(url: url)
-            // Mastodon uses an intermediate redirect page for browsers which requires user input that we don't want.
-            request.addValue("application/activity+json", forHTTPHeaderField: "accept")
-            if let (_, response) = try? await URLSession.appDefault.data(for: request, delegate: RedirectBlocker()),
-              let location = (response as? HTTPURLResponse)?.value(forHTTPHeaderField: "location") {
-               effectiveURL = location
-           } else {
-               effectiveURL = WebURL(url)!.serialized(excludingFragment: true)
-           }
+        if isLikelyMastodonRemoteStatus(url: url),
+           let (_, response) = try? await URLSession.shared.data(from: url, delegate: RedirectBlocker()),
+           let location = (response as? HTTPURLResponse)?.value(forHTTPHeaderField: "location") {
+            effectiveURL = location
         } else {
             effectiveURL = WebURL(url)!.serialized(excludingFragment: true)
         }
@@ -238,14 +232,9 @@ class ConversationViewController: UIViewController {
         let request = Client.search(query: effectiveURL, types: [.statuses], resolve: true)
         do {
             let (results, _) = try await mastodonController.run(request)
-            let statuses = results.statuses.compactMap(\.value)
-            // Don't try to exactly match effective URL because the URL form Mastodon
-            // uses for the ActivityPub redirect doesn't match what's returned by the API.
-            // Instead we just assume that, if only one status was returned, it worked.
-            guard statuses.count == 1 else {
+            guard let status = results.statuses.first(where: { $0.url?.serialized() == effectiveURL }) else {
                 throw UnableToResolveError()
             }
-            let status = statuses[0]
             _ = mastodonController.persistentContainer.addOrUpdateOnViewContext(status: status)
             mode = .localID(status.id)
             return status.id

Tusker/Screens/Customize Timelines/CustomizeTimelinesView.swift

@@ -13,7 +13,7 @@ struct CustomizeTimelinesView: View {
     let mastodonController: MastodonController
     
     var body: some View {
-        CustomizeTimelinesList(pinnedTimelines: mastodonController.accountPreferences.pinnedTimelines)
+        CustomizeTimelinesList()
             .environmentObject(mastodonController)
             .environment(\.managedObjectContext, mastodonController.persistentContainer.viewContext)
     }
@@ -26,15 +26,7 @@ struct CustomizeTimelinesList: View {
     @FetchRequest(sortDescriptors: []) private var filters: FetchedResults<FilterMO>
     @Environment(\.dismiss) private var dismiss
     @State private var deletionError: (any Error)?
-    // store this separately from AccountPreferences in the view, b/c the @LazilyDecoding wrapper breaks animations
-    @State private var pinnedTimelines: [PinnedTimeline]
-    @State private var isShowingAddHashtagSheet = false
-    @State private var isShowingAddInstanceSheet = false
     
-    init(pinnedTimelines: [PinnedTimeline]) {
-        self.pinnedTimelines = pinnedTimelines
-    }
-
     var body: some View {
         if #available(iOS 16.0, *) {
             NavigationStack {
@@ -58,12 +50,8 @@ struct CustomizeTimelinesList: View {
     
     private var navigationBody: some View {
         List {
-            PinnedTimelinesView(
-                pinnedTimelines: $pinnedTimelines,
-                isShowingAddHashtagSheet: $isShowingAddHashtagSheet,
-                isShowingAddInstanceSheet: $isShowingAddInstanceSheet
-            )
-            .appGroupedListRowBackground()
+            PinnedTimelinesView(accountPreferences: mastodonController.accountPreferences)
+                .appGroupedListRowBackground()
             
             Section {
                 Toggle(isOn: $preferences.hideReblogsInTimelines) {
@@ -111,12 +99,6 @@ struct CustomizeTimelinesList: View {
                 }
             }
         }
-        .modifier(PinnedTimelinesModifier(
-            accountPreferences: mastodonController.accountPreferences,
-            pinnedTimelines: $pinnedTimelines,
-            isShowingAddHashtagSheet: $isShowingAddHashtagSheet,
-            isShowingAddInstanceSheet: $isShowingAddInstanceSheet
-        ))
         .alertWithData("Error Deleting Filter", data: $deletionError, actions: { _ in
             Button("OK") {
                 self.deletionError = nil

Tusker/Screens/Customize Timelines/PinnedTimelinesView.swift

@@ -11,10 +11,17 @@ import Pachyderm
 
 struct PinnedTimelinesView: View {
     @EnvironmentObject private var mastodonController: MastodonController
+    @ObservedObject private var accountPreferences: AccountPreferences
     
-    @Binding var pinnedTimelines: [PinnedTimeline]
-    @Binding var isShowingAddHashtagSheet: Bool
-    @Binding var isShowingAddInstanceSheet: Bool
+    @State private var isShowingAddHashtagSheet = false
+    @State private var isShowingAddInstanceSheet = false
+    // store this separately from AccountPreferences in the view, b/c the @LazilyDecoding wrapper breaks animations
+    @State private var pinnedTimelines: [PinnedTimeline]
+    
+    init(accountPreferences: AccountPreferences) {
+        self.accountPreferences = accountPreferences
+        self.pinnedTimelines = accountPreferences.pinnedTimelines
+    }
     
     var body: some View {
         Section {
@@ -103,53 +110,42 @@ struct PinnedTimelinesView: View {
         } header: {
             Text("Pinned Timelines")
         }
-    }
-}
-
-struct PinnedTimelinesModifier: ViewModifier {
-    let accountPreferences: AccountPreferences
-    @Binding var pinnedTimelines: [PinnedTimeline]
-    @Binding var isShowingAddHashtagSheet: Bool
-    @Binding var isShowingAddInstanceSheet: Bool
-
-    func body(content: Content) -> some View {
-        content
-            .sheet(isPresented: $isShowingAddHashtagSheet, content: {
-                #if os(visionOS)
+        .sheet(isPresented: $isShowingAddHashtagSheet, content: {
+            #if os(visionOS)
+            AddHashtagPinnedTimelineView(pinnedTimelines: $pinnedTimelines)
+                .edgesIgnoringSafeArea(.bottom)
+            #else
+            if #available(iOS 16.0, *) {
                 AddHashtagPinnedTimelineView(pinnedTimelines: $pinnedTimelines)
                     .edgesIgnoringSafeArea(.bottom)
-                #else
-                if #available(iOS 16.0, *) {
-                    AddHashtagPinnedTimelineView(pinnedTimelines: $pinnedTimelines)
-                        .edgesIgnoringSafeArea(.bottom)
-                } else {
-                    AddHashtagPinnedTimelineRepresentable(pinnedTimelines: $pinnedTimelines)
-                        .edgesIgnoringSafeArea(.bottom)
-                }
-                #endif
-            })
-            .sheet(isPresented: $isShowingAddInstanceSheet, content: {
-                AddInstancePinnedTimelineView(pinnedTimelines: $pinnedTimelines)
+            } else {
+                AddHashtagPinnedTimelineRepresentable(pinnedTimelines: $pinnedTimelines)
                     .edgesIgnoringSafeArea(.bottom)
-            })
-            .onReceive(accountPreferences.publisher(for: \.pinnedTimelinesData)) { _ in
-                if pinnedTimelines != accountPreferences.pinnedTimelines {
-                    pinnedTimelines = accountPreferences.pinnedTimelines
-                }
-            }
-            #if os(visionOS)
-            .onChange(of: pinnedTimelines) {
-                if accountPreferences.pinnedTimelines != pinnedTimelines {
-                    accountPreferences.pinnedTimelines = pinnedTimelines
-                }
-            }
-            #else
-            .onChange(of: pinnedTimelines) { newValue in
-                if accountPreferences.pinnedTimelines != newValue {
-                    accountPreferences.pinnedTimelines = newValue
-                }
             }
             #endif
+        })
+        .sheet(isPresented: $isShowingAddInstanceSheet, content: {
+            AddInstancePinnedTimelineView(pinnedTimelines: $pinnedTimelines)
+                .edgesIgnoringSafeArea(.bottom)
+        })
+        .onReceive(accountPreferences.publisher(for: \.pinnedTimelinesData)) { _ in
+            if pinnedTimelines != accountPreferences.pinnedTimelines {
+                pinnedTimelines = accountPreferences.pinnedTimelines
+            }
+        }
+        #if os(visionOS)
+        .onChange(of: pinnedTimelines) {
+            if accountPreferences.pinnedTimelines != pinnedTimelines {
+                accountPreferences.pinnedTimelines = pinnedTimelines
+            }
+        }
+        #else
+        .onChange(of: pinnedTimelines) { newValue in
+            if accountPreferences.pinnedTimelines != newValue {
+                accountPreferences.pinnedTimelines = newValue
+            }
+        }
+        #endif
     }
 }
 

Tusker/Screens/Explore/ExploreViewController.swift

@@ -59,7 +59,7 @@ class ExploreViewController: UIViewController, UICollectionViewDelegate, Collect
         
         resultsController = SearchResultsViewController(mastodonController: mastodonController)
         resultsController.exploreNavigationController = self.navigationController!
-        searchController = MastodonSearchController(searchResultsController: resultsController, owner: self)
+        searchController = MastodonSearchController(searchResultsController: resultsController)
         definesPresentationContext = true
         
         navigationItem.searchController = searchController

Tusker/Screens/Explore/InlineTrendsViewController.swift

@@ -34,7 +34,7 @@ class InlineTrendsViewController: UIViewController {
 
         resultsController = SearchResultsViewController(mastodonController: mastodonController)
         resultsController.exploreNavigationController = self.navigationController
-        searchController = MastodonSearchController(searchResultsController: resultsController, owner: self)
+        searchController = MastodonSearchController(searchResultsController: resultsController)
         searchController.obscuresBackgroundDuringPresentation = true
         searchController.hidesNavigationBarDuringPresentation = false
         definesPresentationContext = true

Tusker/Screens/Explore/SuggestedProfilesViewController.swift

@@ -184,19 +184,7 @@ extension SuggestedProfilesViewController: UICollectionViewDelegate {
         return UIContextMenuConfiguration {
             ProfileViewController(accountID: id, mastodonController: self.mastodonController)
         } actionProvider: { _ in
-            let dismiss = UIAction(title: "Remove Suggestion", image: UIImage(systemName: "trash"), attributes: .destructive) { [unowned self] _ in
-                let service = RemoveProfileSuggestionService(accountID: id, mastodonController: self.mastodonController, presenter: self) { [weak self] in
-                    guard let self else { return }
-                    var snapshot = self.dataSource.snapshot()
-                    // the source here doesn't matter, since it's ignored by the equatable and hashable impls
-                    snapshot.deleteItems([.account(id, .global)])
-                    self.dataSource.apply(snapshot, animatingDifferences: true)
-                }
-                Task {
-                    await service.run()
-                }
-            }
-            return UIMenu(children: [UIMenu(options: .displayInline, children: [dismiss])] + self.actionsForProfile(accountID: id, source: .view(cell)))
+            UIMenu(children: self.actionsForProfile(accountID: id, source: .view(cell)))
         }
     }
     

Tusker/Screens/Explore/TrendingStatusesViewController.swift

@@ -123,7 +123,7 @@ class TrendingStatusesViewController: UIViewController, CollectionViewController
     private func loadTrendingStatuses() async {
         let statuses: [Status]
         do {
-            statuses = try await mastodonController.run(Client.getTrendingStatuses()).0.compactMap(\.value)
+            statuses = try await mastodonController.run(Client.getTrendingStatuses()).0
         } catch {
             let snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
             await MainActor.run {

Tusker/Screens/Explore/TrendsViewController.swift

@@ -277,7 +277,7 @@ class TrendsViewController: UIViewController, CollectionViewController {
             let linksReq = Client.getTrendingLinks(limit: 10)
             async let links = try? mastodonController.run(linksReq).0
             let statusesReq = Client.getTrendingStatuses(limit: 10)
-            async let statuses = try? mastodonController.run(statusesReq).0.compactMap(\.value)
+            async let statuses = try? mastodonController.run(statusesReq).0
 
             if let links = await links {
                 if snapshot.sectionIdentifiers.contains(.profileSuggestions) {
@@ -332,7 +332,7 @@ class TrendsViewController: UIViewController, CollectionViewController {
         
         do {
             let request = Client.getTrendingStatuses(offset: origSnapshot.itemIdentifiers(inSection: .trendingStatuses).count)
-            let statuses = try await mastodonController.run(request).0.compactMap(\.value)
+            let (statuses, _) = try await mastodonController.run(request)
             
             await mastodonController.persistentContainer.addAll(statuses: statuses)
             
@@ -368,14 +368,20 @@ class TrendsViewController: UIViewController, CollectionViewController {
     
     @MainActor
     private func removeProfileSuggestion(accountID: String) async {
-        let service = RemoveProfileSuggestionService(accountID: accountID, mastodonController: mastodonController, presenter: self) { [weak self] in
-            guard let self else { return }
-            var snapshot = self.dataSource.snapshot()
+        let req = Suggestion.remove(accountID: accountID)
+        do {
+            _ = try await mastodonController.run(req)
+            var snapshot = dataSource.snapshot()
             // the source here doesn't matter, since it's ignored by the equatable and hashable impls
             snapshot.deleteItems([.account(accountID, .global)])
-            self.dataSource.apply(snapshot, animatingDifferences: true)
+            await apply(snapshot: snapshot)
+        } catch {
+            let config = ToastConfiguration(from: error, with: "Error Removing Suggestion", in: self) { [unowned self] toast in
+                toast.dismissToast(animated: true)
+                _ = await self.removeProfileSuggestion(accountID: accountID)
+            }
+            self.showToast(configuration: config, animated: true)
         }
-        await service.run()
     }
 }
 

Tusker/Screens/Fast Account Switcher/FastAccountSwitcherViewController.swift

@@ -204,19 +204,14 @@ class FastAccountSwitcherViewController: UIViewController {
     @objc private func handleLongPress(_ recognizer: UIGestureRecognizer) {
         switch recognizer.state {
         case .began:
-            show()
-            
             #if !os(visionOS)
-            if #available(iOS 17.5, *) {
-                UIImpactFeedbackGenerator(style: .heavy, view: view).impactOccurred(at: CGPoint(x: view.bounds.midX, y: view.bounds.midY))
-                selectionChangedFeedbackGenerator = UISelectionFeedbackGenerator(view: view)
-            } else {
-                UIImpactFeedbackGenerator(style: .heavy).impactOccurred()
-                selectionChangedFeedbackGenerator = UISelectionFeedbackGenerator()
-            }
+            UIImpactFeedbackGenerator(style: .heavy).impactOccurred()
+            selectionChangedFeedbackGenerator = UISelectionFeedbackGenerator()
             selectionChangedFeedbackGenerator?.prepare()
             #endif
             
+            show()
+            
         case .changed:
             let location = recognizer.location(in: view)
             
@@ -265,11 +260,7 @@ class FastAccountSwitcherViewController: UIViewController {
             
             #if !os(visionOS)
             if hapticFeedback {
-                if #available(iOS 17.5, *) {
-                    selectionChangedFeedbackGenerator?.selectionChanged(at: location)
-                } else {
-                    selectionChangedFeedbackGenerator?.selectionChanged()
-                }
+                selectionChangedFeedbackGenerator?.selectionChanged()
                 selectionChangedFeedbackGenerator?.prepare()
             }
             #endif

Tusker/Screens/Gallery/StatusAttachmentsGalleryDataSource.swift

@@ -98,7 +98,7 @@ class StatusAttachmentsGalleryDataSource: GalleryDataSource {
         case .unknown:
             return LoadingGalleryContentViewController(caption: nil) {
                 do {
-                    let (data, _) = try await URLSession.appDefault.data(from: attachment.url)
+                    let (data, _) = try await URLSession.shared.data(from: attachment.url)
                     let url = FileManager.default.temporaryDirectory.appendingPathComponent(attachment.url.lastPathComponent)
                     try data.write(to: url)
                     return FallbackGalleryNavigationController(url: url)

Tusker/Screens/Gallery/VideoControlsViewController.swift

@@ -120,15 +120,6 @@ class VideoControlsViewController: UIViewController {
         fatalError("init(coder:) has not been implemented")
     }
     
-    deinit {
-        if let timestampObserverToken {
-            player.removeTimeObserver(timestampObserverToken)
-        }
-        if let scrubberObserverToken {
-            player.removeTimeObserver(scrubberObserverToken)
-        }
-    }
-    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -265,18 +256,15 @@ private class VideoScrubbingControl: UIControl {
     
     private func updateFillLayerMask() {
         // I don't know where this animation is coming from
+        CATransaction.begin()
+        CATransaction.setDisableActions(true)
         fillMaskLayer.frame = CGRect(x: 0, y: 0, width: fractionComplete * bounds.width, height: 8)
-        fillMaskLayer.removeAllAnimations()
+        CATransaction.commit()
     }
     
     override func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
-        if touch.type == .pencil || touch.type == .indirectPointer {
-            touchStartLocation = .zero
-            scrubbingStartFraction = 0
-        } else {
-            touchStartLocation = touch.location(in: self)
-            scrubbingStartFraction = fractionComplete
-        }
+        touchStartLocation = touch.location(in: self)
+        scrubbingStartFraction = fractionComplete
         
         animator = UIViewPropertyAnimator(duration: 0.1, curve: .linear)
         animator!.addAnimations {
@@ -287,28 +275,17 @@ private class VideoScrubbingControl: UIControl {
         sendActions(for: .editingDidBegin)
         
         #if !os(visionOS)
-        if #available(iOS 17.5, *) {
-            feedbackGenerator = UIImpactFeedbackGenerator(style: .light, view: self)
-        } else {
-            feedbackGenerator = UIImpactFeedbackGenerator(style: .light)
-        }
+        feedbackGenerator = UIImpactFeedbackGenerator(style: .light)
         feedbackGenerator!.prepare()
         #endif
         
-        updateScrubbing(for: touch)
-
         return true
     }
     
     override func continueTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
-        updateScrubbing(for: touch)
-        return true
-    }
-    
-    private func updateScrubbing(for touch: UITouch) {
         guard let touchStartLocation,
               let scrubbingStartFraction else {
-            return
+            return false
         }
         let location = touch.location(in: self)
         let translation = CGPoint(x: location.x - touchStartLocation.x, y: location.y - touchStartLocation.y)
@@ -317,11 +294,7 @@ private class VideoScrubbingControl: UIControl {
         let newFractionComplete = max(0, min(1, unclampedFractionComplete))
         #if !os(visionOS)
         if newFractionComplete != fractionComplete && (newFractionComplete == 0 || newFractionComplete == 1) {
-            if #available(iOS 17.5, *) {
-                feedbackGenerator!.impactOccurred(intensity: 0.5, at: location)
-            } else {
-                feedbackGenerator!.impactOccurred(intensity: 0.5)
-            }
+            feedbackGenerator!.impactOccurred(intensity: 0.5)
         }
         #endif
         fractionComplete = newFractionComplete
@@ -338,6 +311,8 @@ private class VideoScrubbingControl: UIControl {
             transform = CGAffineTransform(scaleX: 1 + stretchAmount / bounds.width, y: 1 + 0.5 * (1 - stretchFactor))
                 .translatedBy(x: sign(unclampedFractionComplete) * stretchAmount / 2, y: 0)
         }
+        
+        return true
     }
     
     override func endTracking(_ touch: UITouch?, with event: UIEvent?) {

Tusker/Screens/Gallery/VideoGalleryContentViewController.swift

@@ -29,7 +29,6 @@ class VideoGalleryContentViewController: UIViewController, GalleryContentViewCon
     private var rateObservation: NSKeyValueObservation?
     private var isFirstAppearance = true
     private var hideControlsWorkItem: DispatchWorkItem?
-    private var audioSessionToken: AudioSessionCoordinator.Token?
     
     init(url: URL, caption: String?) {
         self.url = url
@@ -173,7 +172,10 @@ class VideoGalleryContentViewController: UIViewController, GalleryContentViewCon
         let wasFirstAppearance = isFirstAppearance
         isFirstAppearance = false
         
-        audioSessionToken = AudioSessionCoordinator.shared.beginPlayback(mode: .video) {
+        DispatchQueue.global(qos: .userInitiated).async {
+            try? AVAudioSession.sharedInstance().setCategory(.playback)
+            try? AVAudioSession.sharedInstance().setActive(true)
+            
             if wasFirstAppearance {
                 DispatchQueue.main.async {
                     self.player.play()
@@ -185,8 +187,8 @@ class VideoGalleryContentViewController: UIViewController, GalleryContentViewCon
     func galleryContentWillDisappear() {
         player.pause()
         
-        if let audioSessionToken {
-            AudioSessionCoordinator.shared.endPlayback(token: audioSessionToken)
+        DispatchQueue.global(qos: .userInitiated).async {
+            try? AVAudioSession.sharedInstance().setActive(false, options: .notifyOthersOnDeactivation)
         }
     }
     

Tusker/Screens/Gallery/VideoOverlayViewController.swift

@@ -106,9 +106,6 @@ class VideoOverlayViewController: UIViewController {
         if player.rate > 0 {
             player.rate = 0
         } else {
-            if player.currentTime() >= player.currentItem!.duration {
-                player.seek(to: .zero)
-            }
             #if os(visionOS)
             player.play()
             #else

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

@@ -17,7 +17,7 @@ class LocalPredicateStatusesViewController: UIViewController, CollectionViewCont
     let mastodonController: MastodonController
     private let predicate: (StatusMO) -> Bool
     private let predicateTitle: String
-    private let request: (RequestRange) -> Request<[TryDecode<Status>]>
+    private let request: (RequestRange) -> Request<[Status]>
     
     var collectionView: UICollectionView! {
         view as? UICollectionView
@@ -28,7 +28,7 @@ class LocalPredicateStatusesViewController: UIViewController, CollectionViewCont
     private var newer: RequestRange?
     private var older: RequestRange?
     
-    init(predicate: @escaping (StatusMO) -> Bool, predicateTitle: String, request: @escaping (RequestRange) -> Request<[TryDecode<Status>]>, mastodonController: MastodonController) {
+    init(predicate: @escaping (StatusMO) -> Bool, predicateTitle: String, request: @escaping (RequestRange) -> Request<[Status]>, mastodonController: MastodonController) {
         self.mastodonController = mastodonController
         self.predicate = predicate
         self.predicateTitle = predicateTitle
@@ -140,8 +140,7 @@ class LocalPredicateStatusesViewController: UIViewController, CollectionViewCont
         
         do {
             let req = request(.count(Self.pageSize))
-            let (tryStatuses, pagination) = try await mastodonController.run(req)
-            let statuses = tryStatuses.compactMap(\.value)
+            let (statuses, pagination) = try await mastodonController.run(req)
             newer = pagination?.newer
             older = pagination?.older
             
@@ -181,8 +180,7 @@ class LocalPredicateStatusesViewController: UIViewController, CollectionViewCont
         
         do {
             let req = request(older.withCount(Self.pageSize))
-            let (tryStatuses, pagination) = try await mastodonController.run(req)
-            let statuses = tryStatuses.compactMap(\.value)
+            let (statuses, pagination) = try await mastodonController.run(req)
             self.older = pagination?.older
             
             await mastodonController.persistentContainer.addAll(statuses: statuses)
@@ -280,8 +278,7 @@ class LocalPredicateStatusesViewController: UIViewController, CollectionViewCont
         Task {
             do {
                 let req = request(newer.withCount(Self.pageSize))
-                let (tryStatuses, pagination) = try await mastodonController.run(req)
-                let statuses = tryStatuses.compactMap(\.value)
+                let (statuses, pagination) = try await mastodonController.run(req)
                 self.newer = pagination?.newer
                 
                 await mastodonController.persistentContainer.addAll(statuses: statuses)

Tusker/Screens/Main/AccountSwitchingContainerViewController.swift

@@ -23,7 +23,7 @@ class AccountSwitchingContainerViewController: UIViewController {
     private(set) var currentAccountID: String
     private(set) var root: AccountSwitchableViewController
     
-    private var viewControllers: [String: (AccountSwitchableViewController?, NSUserActivity)] = [:]
+    private var userActivities: [String: NSUserActivity] = [:]
     
     init(root: AccountSwitchableViewController, for account: UserAccountInfo) {
         self.currentAccountID = account.id
@@ -42,49 +42,27 @@ class AccountSwitchingContainerViewController: UIViewController {
         embedChild(root)
     }
     
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-        viewControllers = viewControllers.mapValues { (_, activity) in
-            (nil, activity)
-        }
-    }
-    
-    func removeAccount(_ account: UserAccountInfo) {
-        viewControllers.removeValue(forKey: account.id)
-    }
-    
-    func setRoot(_ newRootProvider: () -> AccountSwitchableViewController, for account: UserAccountInfo, animating direction: AnimationDirection) {
+    func setRoot(_ newRoot: AccountSwitchableViewController, for account: UserAccountInfo, animating direction: AnimationDirection) {
         let oldRoot = self.root
         if direction == .none {
             oldRoot.removeViewAndController()
         }
         if let activity = oldRoot.stateRestorationActivity() {
             stateRestorationLogger.debug("AccountSwitchingContainer: saving \(activity.activityType, privacy: .public) for \(self.currentAccountID, privacy: .public)")
-            viewControllers[currentAccountID] = (oldRoot, activity)
-        }
-        
-        let newRoot: AccountSwitchableViewController
-        if let (existingRoot, activity) = viewControllers.removeValue(forKey: account.id) {
-            if let existingRoot {
-                newRoot = existingRoot
-                stateRestorationLogger.debug("AccountSwitchingContainer: reusing existing VC for \(account.id, privacy: .public)")
-            } else {
-                newRoot = newRootProvider()
-                Task(priority: .userInitiated) {
-                    stateRestorationLogger.debug("AccountSwitchingContainer: restoring \(activity.activityType, privacy: .public) for \(account.id, privacy: .public)")
-                    let context = StateRestorationUserActivityHandlingContext(root: newRoot)
-                    _ = await activity.handleResume(manager: UserActivityManager(scene: view.window!.windowScene!, context: context))
-                    context.finalize(activity: activity)
-                }
-            }
-        } else {
-            newRoot = newRootProvider()
+            userActivities[currentAccountID] = activity
         }
         
         self.currentAccountID = account.id
         self.root = newRoot
         embedChild(newRoot)
         
+        if let activity = userActivities.removeValue(forKey: account.id) {
+            stateRestorationLogger.debug("AccountSwitchingContainer: restoring \(activity.activityType, privacy: .public) for \(account.id, privacy: .public)")
+            let context = StateRestorationUserActivityHandlingContext(root: newRoot)
+            _ = activity.handleResume(manager: UserActivityManager(scene: view.window!.windowScene!, context: context))
+            context.finalize(activity: activity)
+        }
+        
         if direction != .none {
             if UIAccessibility.prefersCrossFadeTransitions {
                 newRoot.view.alpha = 0
@@ -114,7 +92,6 @@ class AccountSwitchingContainerViewController: UIViewController {
                 #endif
 
                 // only one edge is affected in each direction, i have no idea why
-                let origAdditionalSafeAreaInsets = oldRoot.additionalSafeAreaInsets
                 if direction == .upwards {
                     oldRoot.additionalSafeAreaInsets.bottom = view.safeAreaInsets.bottom
                 } else {
@@ -125,8 +102,6 @@ class AccountSwitchingContainerViewController: UIViewController {
                     oldRoot.view.transform = CGAffineTransform(translationX: 0, y: -newInitialOffset).scaledBy(x: scale, y: scale)
                     newRoot.view.transform = .identity
                 } completion: { (_) in
-                    oldRoot.view.transform = .identity
-                    oldRoot.additionalSafeAreaInsets = origAdditionalSafeAreaInsets
                     oldRoot.removeViewAndController()
                     newRoot.view.layer.masksToBounds = false
                 }
@@ -152,9 +127,9 @@ extension AccountSwitchingContainerViewController: TuskerRootViewController {
         root.compose(editing: draft, animated: animated, isDucked: isDucked)
     }
     
-    func select(route: TuskerRoute, animated: Bool, completion: (() -> Void)?) {
+    func select(route: TuskerRoute, animated: Bool) {
         loadViewIfNeeded()
-        root.select(route: route, animated: animated, completion: completion)
+        root.select(route: route, animated: animated)
     }
     
     func getTabController(tab: MainTabBarViewController.Tab) -> UIViewController? {

Tusker/Screens/Main/Duckable+Root.swift

@@ -35,8 +35,8 @@ extension DuckableContainerViewController: AccountSwitchableViewController {
         (child as! TuskerRootViewController).getNavigationController()
     }
     
-    func select(route: TuskerRoute, animated: Bool, completion: (() -> Void)?) {
-        (child as? TuskerRootViewController)?.select(route: route, animated: animated, completion: completion)
+    func select(route: TuskerRoute, animated: Bool) {
+        (child as? TuskerRootViewController)?.select(route: route, animated: animated)
     }
     
     func getTabController(tab: MainTabBarViewController.Tab) -> UIViewController? {

Tusker/Screens/Main/MainSidebarViewController.swift

@@ -13,8 +13,8 @@ import Combine
 @MainActor
 protocol MainSidebarViewControllerDelegate: AnyObject {
     func sidebarRequestPresentCompose(_ sidebarViewController: MainSidebarViewController)
-    func sidebar(_ sidebarViewController: MainSidebarViewController, didSelectItem item: MainSidebarViewController.Item, previousItem: MainSidebarViewController.Item?)
-    func sidebar(_ sidebarViewController: MainSidebarViewController, showViewController viewController: UIViewController, previousItem: MainSidebarViewController.Item?)
+    func sidebar(_ sidebarViewController: MainSidebarViewController, didSelectItem item: MainSidebarViewController.Item)
+    func sidebar(_ sidebarViewController: MainSidebarViewController, showViewController viewController: UIViewController)
     func sidebar(_ sidebarViewController: MainSidebarViewController, scrollToTopFor item: MainSidebarViewController.Item)
 }
 
@@ -43,7 +43,7 @@ class MainSidebarViewController: UIViewController {
     }
     
     var exploreTabItems: [Item] {
-        var items: [Item] = [.tab(.explore), .bookmarks, .favorites]
+        var items: [Item] = [.explore, .bookmarks, .favorites]
         let snapshot = dataSource.snapshot()
         for case let .list(list) in snapshot.itemIdentifiers(inSection: .lists) {
             items.append(.list(list))
@@ -57,7 +57,7 @@ class MainSidebarViewController: UIViewController {
         return items
     }
     
-    private var previouslySelectedItem: Item?
+    private(set) var previouslySelectedItem: Item?
     var selectedItem: Item? {
         guard let indexPath = collectionView?.indexPathsForSelectedItems?.first else {
             return nil
@@ -170,7 +170,7 @@ class MainSidebarViewController: UIViewController {
         snapshot.appendItems([
             .tab(.timelines),
             .tab(.notifications),
-            .tab(.explore),
+            .explore,
             .bookmarks,
             .favorites,
             .tab(.myProfile)
@@ -261,21 +261,19 @@ class MainSidebarViewController: UIViewController {
     }
     
     private func returnToPreviousItem() {
-        let oldItem = selectedItem
-        let newItem = previouslySelectedItem ?? .tab(.timelines)
+        let item = previouslySelectedItem ?? .tab(.timelines)
         previouslySelectedItem = nil
-        select(item: newItem, animated: true)
-        sidebarDelegate?.sidebar(self, didSelectItem: newItem, previousItem: oldItem)
+        select(item: item, animated: true)
+        sidebarDelegate?.sidebar(self, didSelectItem: item)
     }
 
     private func showAddList() {
         let service = CreateListService(mastodonController: mastodonController, present: { self.present($0, animated: true
         ) }) { list in
-            let oldItem = self.selectedItem
             self.select(item: .list(list), animated: false)
             let list = ListTimelineViewController(for: list, mastodonController: self.mastodonController)
             list.presentEditOnAppear = true
-            self.sidebarDelegate?.sidebar(self, showViewController: list, previousItem: oldItem)
+            self.sidebarDelegate?.sidebar(self, showViewController: list)
         }
         service.run()
     }
@@ -302,7 +300,7 @@ class MainSidebarViewController: UIViewController {
             return UserActivityManager.checkNotificationsActivity(mode: Preferences.shared.defaultNotificationsMode, accountID: id)
         case .tab(.compose):
             return UserActivityManager.newPostActivity(accountID: id)
-        case .tab(.explore):
+        case .explore:
             return UserActivityManager.searchActivity(query: nil, accountID: id)
         case .bookmarks:
             return UserActivityManager.bookmarksActivity(accountID: id)
@@ -340,7 +338,7 @@ extension MainSidebarViewController {
     }
     enum Item: Hashable {
         case tab(MainTabBarViewController.Tab)
-        case bookmarks, favorites
+        case explore, bookmarks, favorites
         case listsHeader, list(List), addList
         case savedHashtagsHeader, savedHashtag(String), addSavedHashtag
         case savedInstancesHeader, savedInstance(URL), addSavedInstance
@@ -349,6 +347,8 @@ extension MainSidebarViewController {
             switch self {
             case let .tab(tab):
                 return tab.title
+            case .explore:
+                return "Explore"
             case .bookmarks:
                 return "Bookmarks"
             case .favorites:
@@ -378,6 +378,8 @@ extension MainSidebarViewController {
             switch self {
             case let .tab(tab):
                 return tab.imageName
+            case .explore:
+                return "magnifyingglass"
             case .bookmarks:
                 return "bookmark"
             case .favorites:
@@ -469,7 +471,7 @@ extension MainSidebarViewController: UICollectionViewDelegate {
                 fatalError("unreachable")
             }
         } else {
-            sidebarDelegate?.sidebar(self, didSelectItem: item, previousItem: previouslySelectedItem)
+            sidebarDelegate?.sidebar(self, didSelectItem: item)
         }
     }
     
@@ -538,9 +540,8 @@ extension MainSidebarViewController: UICollectionViewDragDelegate {
 extension MainSidebarViewController: InstanceTimelineViewControllerDelegate {
     func didSaveInstance(url: URL) {
         dismiss(animated: true) {
-            let oldItem = self.selectedItem
             self.select(item: .savedInstance(url), animated: true)
-            self.sidebarDelegate?.sidebar(self, didSelectItem: .savedInstance(url), previousItem: oldItem)
+            self.sidebarDelegate?.sidebar(self, didSelectItem: .savedInstance(url))
         }
     }
     

Tusker/Screens/Main/MainSplitViewController.swift

@@ -86,7 +86,7 @@ class MainSplitViewController: UISplitViewController {
         // don't unnecesarily construct a content VC unless the we're in actually split mode
         // when we change from compact -> split for the first time, the VC will be transferred anyways
         if traitCollection.horizontalSizeClass != .compact {
-            doSelect(item: .tab(.timelines))
+            select(item: .tab(.timelines))
         }
         
         if UIDevice.current.userInterfaceIdiom != .mac {
@@ -149,15 +149,7 @@ class MainSplitViewController: UISplitViewController {
         self.setViewController(newNav, for: .secondary)
     }
     
-    private func select(newItem: MainSidebarViewController.Item, oldItem: MainSidebarViewController.Item?) {
-        if let oldItem,
-           newItem != oldItem {
-            navigationStacks[oldItem] = secondaryNavController.viewControllers
-        }
-        doSelect(item: newItem)
-    }
-    
-    private func doSelect(item: MainSidebarViewController.Item) {
+    func select(item: MainSidebarViewController.Item) {
         secondaryNavController.viewControllers = getOrCreateNavigationStack(item: item)
     }
     
@@ -188,28 +180,28 @@ class MainSplitViewController: UISplitViewController {
     }
     
     @objc func handleSidebarCommandTimelines() {
-        select(newItem: .tab(.timelines), oldItem: sidebar.selectedItem)
         sidebar.select(item: .tab(.timelines), animated: false)
+        select(item: .tab(.timelines))
     }
     
     @objc func handleSidebarCommandNotifications() {
-        select(newItem: .tab(.notifications), oldItem: sidebar.selectedItem)
         sidebar.select(item: .tab(.notifications), animated: false)
+        select(item: .tab(.notifications))
     }
     
     @objc func handleSidebarCommandExplore() {
-        select(newItem: .tab(.explore), oldItem: sidebar.selectedItem)
         sidebar.select(item: .tab(.explore), animated: false)
+        select(item: .tab(.explore))
     }
     
     @objc func handleSidebarCommandBookmarks() {
-        select(newItem: .bookmarks, oldItem: sidebar.selectedItem)
         sidebar.select(item: .bookmarks, animated: false)
+        select(item: .bookmarks)
     }
     
     @objc func handleSidebarCommandMyProfile() {
-        select(newItem: .tab(.myProfile), oldItem: sidebar.selectedItem)
         sidebar.select(item: .tab(.myProfile), animated: false)
+        select(item: .tab(.myProfile))
     }
     
     @objc private func sidebarTapped() {
@@ -279,7 +271,7 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
                 $0.1 > $1.1
             }
         if let mostRecentExploreItem = mostRecentExploreItem?.0,
-           mostRecentExploreItem != .tab(.explore) {
+           mostRecentExploreItem != .explore {
             let exploreNav = tabBarViewController.viewController(for: .explore) as! UINavigationController
             // Pop back to root, so we're appending to the Explore VC instead of some other VC
             exploreNav.popToRootViewController(animated: false)
@@ -292,7 +284,11 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
         case nil:
             break
             
-        case .tab(.explore):
+        case let .tab(tab):
+            // sidebar items that map 1 <-> 1 can be transferred directly
+            tabBarViewController.select(tab: tab, dismissPresented: false)
+            
+        case .explore:
             // Search sidebar item maps to the Explore tab with the search controller/results visible
             // The nav stack can't be copied directly, since the split VC uses a different SearchViewController
             // so that explore items aren't shown multiple times.
@@ -331,14 +327,10 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
             }
             
             // Transfer the navigation stack, dropping the search VC, to keep anything the user has opened
-            transferNavigationStack(from: .tab(.explore), to: exploreNav, dropFirst: true, append: true)
+            transferNavigationStack(from: .explore, to: exploreNav, dropFirst: true, append: true)
             
             tabBarViewController.select(tab: .explore, dismissPresented: false)
             
-        case let .tab(tab):
-            // sidebar items that map 1 <-> 1 can be transferred directly
-            tabBarViewController.select(tab: tab, dismissPresented: false)
-
         case .bookmarks, .favorites, .list(_), .savedHashtag(_), .savedInstance(_):
             tabBarViewController.select(tab: .explore, dismissPresented: false)
             // Make sure the Explore VC doesn't show its search bar when it appears, in case the user was previously
@@ -396,9 +388,9 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
                 // For other items, the 2nd VC in the nav stack determines which sidebar item they map to.
                 // Search screen has special considerations, all others can be transferred directly.
                 if tabNavigationStack.count == 1 || ((tabNavigationStack.first as? ExploreViewController)?.searchController?.isActive ?? false) {
-                    exploreItem = .tab(.explore)
+                    exploreItem = .explore
                     // reuse the existing VC, if there is one
-                    let searchVC = getOrCreateNavigationStack(item: .tab(.explore)).first! as! InlineTrendsViewController
+                    let searchVC = getOrCreateNavigationStack(item: .explore).first! as! InlineTrendsViewController
                     // load the view so that the search controller is accessible
                     searchVC.loadViewIfNeeded()
                     let explore = tabNavigationStack.first as! ExploreViewController
@@ -426,16 +418,16 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
                     case let instanceVC as InstanceTimelineViewController:
                         exploreItem = .savedInstance(instanceVC.instanceURL)
                     case is TrendsViewController:
-                        exploreItem = .tab(.explore)
+                        exploreItem = .explore
                         // skip transferring the ExploreViewController and TrendsViewController
                         skipFirst = 2
                         // prepend the InlineTrendsViewController
-                        toPrepend = getOrCreateNavigationStack(item: .tab(.explore)).first!
+                        toPrepend = getOrCreateNavigationStack(item: .explore).first!
                     default:
                         // transfer the navigation stack prepending, the existing explore VC
                         // if there was other stuff on the explore stack, it will get discarded
-                        toPrepend = getOrCreateNavigationStack(item: .tab(.explore)).first!
-                        exploreItem = .tab(.explore)
+                        toPrepend = getOrCreateNavigationStack(item: .explore).first!
+                        exploreItem = .explore
                     }
                 }
                 transferNavigationStack(from: tabNavController, to: exploreItem!, skipFirst: skipFirst, prepend: toPrepend)
@@ -452,12 +444,12 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
             // These tabs map 1 <-> 1 with sidebar items
             let item = MainSidebarViewController.Item.tab(tabBarViewController.selectedTab)
             sidebar.select(item: item, animated: false)
-            doSelect(item: item)
+            select(item: item)
             
         case .explore:
             // If the explore tab is active, the sidebar item is determined above when transferring the explore VC's nav stack
             sidebar.select(item: exploreItem!, animated: false)
-            doSelect(item: exploreItem!)
+            select(item: exploreItem!)
             
         default:
             return
@@ -482,13 +474,16 @@ extension MainSplitViewController: MainSidebarViewControllerDelegate {
         compose(editing: nil)
     }
     
-    func sidebar(_ sidebarViewController: MainSidebarViewController, didSelectItem item: MainSidebarViewController.Item, previousItem: MainSidebarViewController.Item?) {
-        select(newItem: item, oldItem: previousItem)
+    func sidebar(_ sidebarViewController: MainSidebarViewController, didSelectItem item: MainSidebarViewController.Item) {
+        if let previous = sidebar.previouslySelectedItem {
+            navigationStacks[previous] = secondaryNavController.viewControllers
+        }
+        select(item: item)
     }
     
-    func sidebar(_ sidebarViewController: MainSidebarViewController, showViewController viewController: UIViewController, previousItem: MainSidebarViewController.Item?) {
-        if let previousItem {
-            navigationStacks[previousItem] = secondaryNavController.viewControllers
+    func sidebar(_ sidebarViewController: MainSidebarViewController, showViewController viewController: UIViewController) {
+        if let previous = sidebar.previouslySelectedItem {
+            navigationStacks[previous] = secondaryNavController.viewControllers
         }
         secondaryNavController.viewControllers = [viewController]
     }
@@ -502,10 +497,10 @@ fileprivate extension MainSidebarViewController.Item {
     @MainActor
     func createRootViewController(_ mastodonController: MastodonController) -> UIViewController? {
         switch self {
-        case .tab(.explore):
-            return InlineTrendsViewController(mastodonController: mastodonController)
         case let .tab(tab):
             return tab.createViewController(mastodonController)
+        case .explore:
+            return InlineTrendsViewController(mastodonController: mastodonController)
         case .bookmarks:
             return BookmarksViewController(mastodonController: mastodonController)
         case .favorites:
@@ -542,14 +537,14 @@ extension MainSplitViewController: StateRestorableViewController {
 }
 
 extension MainSplitViewController: TuskerRootViewController {
-    func select(route: TuskerRoute, animated: Bool, completion: (() -> Void)?) {
+    func select(route: TuskerRoute, animated: Bool) {
         guard traitCollection.horizontalSizeClass != .compact else {
-            tabBarViewController?.select(route: route, animated: animated, completion: completion)
+            tabBarViewController?.select(route: route, animated: animated)
             return
         }
         guard presentedViewController == nil else {
             dismiss(animated: animated) {
-                self.select(route: route, animated: animated, completion: completion)
+                self.select(route: route, animated: animated)
             }
             return
         }
@@ -562,7 +557,7 @@ extension MainSplitViewController: TuskerRootViewController {
         case .myProfile:
             item = .tab(.myProfile)
         case .explore:
-            item = .tab(.explore)
+            item = .explore
         case .bookmarks:
             item = .bookmarks
         case .list(id: let id):
@@ -572,10 +567,8 @@ extension MainSplitViewController: TuskerRootViewController {
                 return
             }
         }
-        let oldItem = sidebar.selectedItem
         sidebar.select(item: item, animated: false)
-        select(newItem: item, oldItem: oldItem)
-        completion?()
+        select(item: item)
     }
     
     func getTabController(tab: MainTabBarViewController.Tab) -> UIViewController? {
@@ -616,8 +609,8 @@ extension MainSplitViewController: TuskerRootViewController {
             return
         }
         
-        if sidebar.selectedItem != .tab(.explore) {
-            select(newItem: .tab(.explore), oldItem: sidebar.selectedItem)
+        if sidebar.selectedItem != .explore {
+            select(item: .explore)
         }
         
         guard let searchViewController = secondaryNavController.viewControllers.first as? InlineTrendsViewController else {

Tusker/Screens/Main/MainTabBarViewController.swift

@@ -289,7 +289,7 @@ extension MainTabBarViewController: StateRestorableViewController {
 }
 
 extension MainTabBarViewController: TuskerRootViewController {
-    func select(route: TuskerRoute, animated: Bool, completion: (() -> Void)?) {
+    func select(route: TuskerRoute, animated: Bool) {
         switch route {
         case .timelines:
             select(tab: .timelines, dismissPresented: true)
@@ -310,7 +310,6 @@ extension MainTabBarViewController: TuskerRootViewController {
                 nav.pushViewController(ListTimelineViewController(for: list, mastodonController: mastodonController), animated: animated)
             }
         }
-        completion?()
     }
     
     func getNavigationDelegate() -> TuskerNavigationDelegate? {

Tusker/Screens/Main/TuskerRootViewController.swift

@@ -12,7 +12,7 @@ import ComposeUI
 @MainActor
 protocol TuskerRootViewController: UIViewController, StateRestorableViewController, StatusBarTappableViewController {
     func compose(editing draft: Draft?, animated: Bool, isDucked: Bool)
-    func select(route: TuskerRoute, animated: Bool, completion: (() -> Void)?)
+    func select(route: TuskerRoute, animated: Bool)
     func getTabController(tab: MainTabBarViewController.Tab) -> UIViewController?
     func getNavigationDelegate() -> TuskerNavigationDelegate?
     func getNavigationController() -> NavigationControllerProtocol
@@ -21,6 +21,33 @@ protocol TuskerRootViewController: UIViewController, StateRestorableViewControll
     func presentPreferences(completion: (() -> Void)?) -> PreferencesNavigationController?
 }
 
+//extension TuskerRootViewController {
+//    func select(route: NewRoute, animated: Bool) {
+//        doApply(components: route.components, animated: animated)
+//    }
+//
+//    private func doApply(components: ArraySlice<RouteComponent>, animated: Bool) {
+//        guard let first = components.first else {
+//            return
+//        }
+//        doApply(component: first, animated: animated) {
+//            self.doApply(components: components.dropFirst(), animated: animated)
+//        }
+//    }
+//
+//    private func doApply(component: RouteComponent, animated: Bool, completion: @escaping () -> Void) {
+//        switch component {
+//        case .topLevelItem(let rootRoute):
+//            select(route: rootRoute)
+//            completion()
+//        case .popToRoot:
+//            _ = getNavigationController().popToRootViewController(animated: animated)
+//            completion()
+//        case .push(<#T##(MastodonController) -> UIViewController#>)
+//        }
+//    }
+//}
+
 enum TuskerRoute {
     case timelines
     case notifications
@@ -30,6 +57,33 @@ enum TuskerRoute {
     case list(id: String)
 }
 
+//struct NewRoute: ExpressibleByArrayLiteral {
+//    let components: [RouteComponent]
+//
+//    init(arrayLiteral elements: RouteComponent...) {
+//        self.components = elements
+//    }
+//
+//    static var timelines: Self { [.topLevelItem(.timelines)] }
+//    static var explore: Self { [.topLevelItem(.explore)] }
+//    static var myProfile: Self { [.topLevelItem(.myProfile)] }
+//    static var bookmarks: Self { [.topLevelItem(.explore), .push({ BookmarksViewController(mastodonController: $0) })] }
+//    static func profile(accountID: String) -> Self { [.topLevelItem(.timelines), .push({ ProfileViewController(accountID: accountID, mastodonController: $0) })] }
+//}
+//
+//enum RouteComponent {
+//    case topLevelItem(RootRoute)
+//    case popToRoot
+//    case push((MastodonController) -> UIViewController)
+//    case present(UIViewController)
+//}
+//
+//enum RootRoute {
+//    case timelines
+//    case explore
+//    case myProfile
+//}
+//
 @MainActor
 protocol NavigationControllerProtocol: UIViewController {
     var viewControllers: [UIViewController] { get set }

Tusker/Screens/Mute/MuteAccountView.swift

@@ -78,20 +78,18 @@ struct MuteAccountView: View {
             }
             .accessibilityHidden(true)
             
-            if mastodonController.instanceFeatures.muteNotifications {
-                Section {
-                    Toggle(isOn: $muteNotifications) {
-                        Text("Hide notifications from this person")
-                    }
-                } footer: {
-                    if muteNotifications {
-                        Text("This user's posts and notifications will be hidden.")
-                    } else {
-                        Text("This user's posts will be hidden from your timeline. You can still receive notifications from them.")
-                    }
+            Section {
+                Toggle(isOn: $muteNotifications) {
+                    Text("Hide notifications from this person")
+                }
+            } footer: {
+                if muteNotifications {
+                    Text("This user's posts and notifications will be hidden.")
+                } else {
+                    Text("This user's posts will be hidden from your timeline. You can still receive notifications from them.")
                 }
-                .appGroupedListRowBackground()
             }
+            .appGroupedListRowBackground()
             
             Section {
                 Picker(selection: $duration) {

Tusker/Screens/Notifications/NotificationLoadingViewController.swift

@@ -95,7 +95,7 @@ class NotificationLoadingViewController: UIViewController {
             return
         }
         guard let navigationController else {
-            fatalError("Don't know how to show notification VC outside of navigation controller: parent is \(parent?.description ?? "<nil>")")
+            fatalError("Don't know how to show notification VC outside of navigation controller")
         }
         navigationController.viewControllers[navigationController.viewControllers.count - 1] = vc
     }

Tusker/Screens/Preferences/Appearance/MockStatusView.swift

@@ -135,11 +135,12 @@ private struct MockStatusCardView: UIViewRepresentable {
     func makeUIView(context: Context) -> StatusCardView {
         let view = StatusCardView()
         view.isUserInteractionEnabled = false
-        let card = StatusCardView.CardData(
+        let card = Card(
             url: WebURL("https://vaccor.space/tusker")!,
-            image: WebURL("https://vaccor.space/tusker/img/icon.png")!,
             title: "Tusker",
-            description: "Tusker is an iOS app for Mastodon"
+            description: "Tusker is an iOS app for Mastodon",
+            image: WebURL("https://vaccor.space/tusker/img/icon.png")!,
+            kind: .link
         )
         view.updateUI(card: card, sensitive: false)
         return view

Tusker/Screens/Preferences/Notifications/PushInstanceSettingsView.swift

@@ -90,7 +90,7 @@ struct PushInstanceSettingsView: View {
         let mastodonController = await MastodonController.getForAccount(account)
         do {
             let result = try await mastodonController.createPushSubscription(subscription: subscription)
-            PushManager.logger.debug("Push subscription \(result.id, privacy: .public) created on \(account.instanceURL) with endpoint \(result.endpoint, privacy: .public)")
+            PushManager.logger.debug("Push subscription \(result.id) created on \(account.instanceURL)")
             self.subscription = subscription
             return true
         } catch {
@@ -112,7 +112,7 @@ struct PushInstanceSettingsView: View {
         let mastodonController = await MastodonController.getForAccount(account)
         do {
             let result = try await mastodonController.updatePushSubscription(alerts: alerts, policy: policy)
-            PushManager.logger.debug("Push subscription \(result.id, privacy: .public) updated on \(account.instanceURL)")
+            PushManager.logger.debug("Push subscription \(result.id) updated on \(account.instanceURL)")
             await PushManager.shared.updateSubscription(account: account, alerts: alerts, policy: policy)
             subscription?.alerts = alerts
             subscription?.policy = policy

Tusker/Screens/Preferences/Tip Jar/TipJarView.swift

@@ -84,9 +84,7 @@ struct TipJarView: View {
     private var productsView: some View {
         if isLoaded {
             VStack {
-                if !supporterProducts.isEmpty {
-                    supporterSubscriptions
-                }
+                supporterSubscriptions
                 
                 tipPurchases
                 
@@ -421,7 +419,6 @@ private class UbiquitousKeyValueStoreObserver: ObservableObject {
 
 private extension View {
     @available(iOS, obsoleted: 17.0)
-    @available(visionOS 1.0, *)
     @ViewBuilder
     func manageSubscriptionsSheetIfAvailable(isPresented: Binding<Bool>, subscriptionGroupID: String) -> some View {
         if #available(iOS 17.0, *) {

Tusker/Screens/Profile/ProfileStatusesViewController.swift

@@ -249,6 +249,13 @@ class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionVie
         
         state = .setupInitialSnapshot
         
+        Task {
+            if let (all, _) = try? await mastodonController.run(Client.getRelationships(accounts: [accountID])),
+               let relationship = all.first {
+                self.mastodonController.persistentContainer.addOrUpdate(relationship: relationship)
+            }
+        }
+        
         await controller.loadInitial()
         await tryLoadPinned()
         
@@ -290,7 +297,7 @@ class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionVie
         }
         
         let request = Account.getStatuses(accountID, range: .default, onlyMedia: false, pinned: true, excludeReplies: false)
-        let statuses = try await mastodonController.run(request).0.compactMap(\.value)
+        let (statuses, _) = try await mastodonController.run(request)
         
         await withCheckedContinuation { continuation in
             mastodonController.persistentContainer.addAll(statuses: statuses) {
@@ -506,7 +513,7 @@ extension ProfileStatusesViewController {
 extension ProfileStatusesViewController: TimelineLikeControllerDataSource {
     typealias TimelineItem = String // status ID
     
-    private func request(for range: RequestRange = .default) -> Request<[TryDecode<Status>]> {
+    private func request(for range: RequestRange = .default) -> Request<[Status]> {
         switch kind {
         case .statuses:
             return Account.getStatuses(accountID, range: range, onlyMedia: false, pinned: false, excludeReplies: true)
@@ -519,7 +526,7 @@ extension ProfileStatusesViewController: TimelineLikeControllerDataSource {
     
     func loadInitial() async throws -> [String] {
         let request = request()
-        let statuses = try await mastodonController.run(request).0.compactMap(\.value)
+        let (statuses, _) = try await mastodonController.run(request)
         
         if !statuses.isEmpty {
             newer = .after(id: statuses.first!.id, count: nil)
@@ -539,7 +546,7 @@ extension ProfileStatusesViewController: TimelineLikeControllerDataSource {
         }
         
         let request = request(for: newer)
-        let statuses = try await mastodonController.run(request).0.compactMap(\.value)
+        let (statuses, _) = try await mastodonController.run(request)
         
         guard !statuses.isEmpty else {
             throw Error.allCaughtUp
@@ -560,7 +567,7 @@ extension ProfileStatusesViewController: TimelineLikeControllerDataSource {
         }
         
         let request = request(for: older)
-        let statuses = try await mastodonController.run(request).0.compactMap(\.value)
+        let (statuses, _) = try await mastodonController.run(request)
         
         guard !statuses.isEmpty else {
             return []

Tusker/Screens/Profile/ProfileViewController.swift

@@ -9,12 +9,6 @@
 import UIKit
 import Pachyderm
 import Combine
-import OSLog
-#if canImport(Sentry)
-import Sentry
-#endif
-
-private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "ProfileViewController")
 
 class ProfileViewController: UIViewController, StateRestorableViewController {
     
@@ -126,19 +120,6 @@ class ProfileViewController: UIViewController, StateRestorableViewController {
         guard let accountID else {
             return
         }
-        Task {
-            do {
-                let (all, _) = try await mastodonController.run(Client.getRelationships(accounts: [accountID]))
-                if let relationship = all.first {
-                    self.mastodonController.persistentContainer.addOrUpdate(relationship: relationship)
-                }
-            } catch {
-                logger.error("Error fetching relationship: \(String(describing: error))")
-                #if canImport(Sentry)
-                SentrySDK.capture(error: error)
-                #endif
-            }
-        }
         if let account = mastodonController.persistentContainer.account(for: accountID) {
             updateAccountUI(account: account)
         } else {

Tusker/Screens/Report/ReportAddStatusView.swift

@@ -53,7 +53,7 @@ struct ReportAddStatusView: View {
                     .task { @MainActor in
                         do {
                             let req = Account.getStatuses(report.accountID, range: .count(40), excludeReplies: false, excludeReblogs: true)
-                            let statuses = try await mastodonController.run(req).0.compactMap(\.value)
+                            let (statuses, _) = try await mastodonController.run(req)
                             await mastodonController.persistentContainer.addAll(statuses: statuses)
                             self.statuses = statuses.compactMap { mastodonController.persistentContainer.status(for: $0.id) }
                         } catch {

Tusker/Screens/Report/ReportStatusView.swift

@@ -12,7 +12,6 @@ import SwiftUI
 private var converter = HTMLConverter(
     font: .preferredFont(forTextStyle: .body),
     monospaceFont: UIFontMetrics.default.scaledFont(for: .monospacedSystemFont(ofSize: 17, weight: .regular)),
-    fontMetrics: .default,
     color: .label,
     paragraphStyle: .default
 )

Tusker/Screens/Search/MastodonSearchController.swift

@@ -24,11 +24,7 @@ class MastodonSearchController: UISearchController {
         super.searchResultsController as! SearchResultsViewController
     }
     
-    private weak var owner: UIViewController?
-    
-    init(searchResultsController: SearchResultsViewController, owner: UIViewController) {
-        self.owner = owner
-        
+    init(searchResultsController: SearchResultsViewController) {
         super.init(searchResultsController: searchResultsController)
         
         searchResultsController.tokenHandler = { [unowned self] token, op in
@@ -156,12 +152,6 @@ extension MastodonSearchController: UISearchBarDelegate {
     }
 }
 
-extension MastodonSearchController: MultiColumnNavigationCustomTargetProviding {
-    var multiColumnNavigationTargetViewController: UIViewController? {
-        owner
-    }
-}
-
 extension UISearchBar {
     var searchQueryWithOperators: String {
         var parts = searchTextField.tokens.compactMap { $0.representedObject as? String }

Tusker/Screens/Search/SearchResultsViewController.swift

@@ -266,7 +266,7 @@ class SearchResultsViewController: UIViewController, CollectionViewController {
                 guard self.currentQuery == query else { return }
                 self.mastodonController.persistentContainer.performBatchUpdates { (context, addAccounts, addStatuses) in
                     addAccounts(results.accounts)
-                    addStatuses(results.statuses.compactMap(\.value))
+                    addStatuses(results.statuses)
                 } completion: {
                     DispatchQueue.main.async {
                         self.showSearchResults(results)
@@ -299,7 +299,7 @@ class SearchResultsViewController: UIViewController, CollectionViewController {
         }
         if !results.statuses.isEmpty && resultTypes.contains(.statuses) {
             snapshot.appendSections([.statuses])
-            snapshot.appendItems(results.statuses.compactMap(\.value).map { .status($0.id, .unknown) }, toSection: .statuses)
+            snapshot.appendItems(results.statuses.map { .status($0.id, .unknown) }, toSection: .statuses)
         }
         
         dataSource.apply(snapshot)
@@ -414,7 +414,7 @@ extension SearchResultsViewController {
                 hasher.combine(id)
             case let .hashtag(hashtag):
                 hasher.combine("hashtag")
-                hasher.combine(hashtag.name)
+                hasher.combine(hashtag.url)
             case let .status(id, _):
                 hasher.combine("status")
                 hasher.combine(id)

Tusker/Screens/Search/SearchTokenSuggestionCollectionViewCell.swift

@@ -30,8 +30,6 @@ class SearchTokenSuggestionCollectionViewCell: UICollectionViewCell {
             label.topAnchor.constraint(equalTo: contentView.topAnchor),
             label.bottomAnchor.constraint(equalTo: contentView.bottomAnchor)
         ])
-        
-        addInteraction(UIPointerInteraction(delegate: self))
     }
     
     required init?(coder: NSCoder) {
@@ -42,10 +40,3 @@ class SearchTokenSuggestionCollectionViewCell: UICollectionViewCell {
         label.text = text
     }
 }
-
-extension SearchTokenSuggestionCollectionViewCell: UIPointerInteractionDelegate {
-    func pointerInteraction(_ interaction: UIPointerInteraction, styleFor region: UIPointerRegion) -> UIPointerStyle? {
-        let preview = UITargetedPreview(view: self)
-        return UIPointerStyle(effect: .lift(preview))
-    }
-}

Tusker/Screens/Timeline/TimelineViewController.swift

@@ -565,8 +565,7 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
         do {
             let (marker, _) = try await mastodonController.run(TimelineMarkers.request(timeline: .home))
             async let status = try await mastodonController.run(Client.getStatus(id: marker.lastReadID)).0
-            // TODO: consider replacing undecodable statuses here with items to indicate that to the user
-            async let olderStatuses = try await mastodonController.run(Client.getStatuses(timeline: .home, range: .before(id: marker.lastReadID, count: Self.pageSize))).0.compactMap(\.value)
+            async let olderStatuses = try await mastodonController.run(Client.getStatuses(timeline: .home, range: .before(id: marker.lastReadID, count: Self.pageSize))).0
             
             let allStatuses = try await [status] + olderStatuses
             await mastodonController.persistentContainer.addAll(statuses: allStatuses)
@@ -1101,7 +1100,7 @@ extension TimelineViewController: TimelineLikeControllerDataSource {
     
     func loadInitial() async throws -> [TimelineItem] {
         let request = Client.getStatuses(timeline: timeline, range: .count(TimelineViewController.pageSize))
-        let statuses = try await mastodonController.run(request).0.compactMap(\.value)
+        let (statuses, _) = try await mastodonController.run(request)
         
         await withCheckedContinuation { continuation in
             mastodonController.persistentContainer.addAll(statuses: statuses) {
@@ -1120,7 +1119,7 @@ extension TimelineViewController: TimelineLikeControllerDataSource {
         let newer = RequestRange.after(id: id, count: TimelineViewController.pageSize)
         
         let request = Client.getStatuses(timeline: timeline, range: newer)
-        let statuses = try await mastodonController.run(request).0.compactMap(\.value)
+        let (statuses, _) = try await mastodonController.run(request)
         
         guard !statuses.isEmpty else {
             throw TimelineViewController.Error.allCaughtUp
@@ -1144,7 +1143,7 @@ extension TimelineViewController: TimelineLikeControllerDataSource {
         let older = RequestRange.before(id: id, count: TimelineViewController.pageSize)
         
         let request = Client.getStatuses(timeline: timeline, range: older)
-        let statuses = try await mastodonController.run(request).0.compactMap(\.value)
+        let (statuses, _) = try await mastodonController.run(request)
         
         guard !statuses.isEmpty else {
             return []
@@ -1182,7 +1181,7 @@ extension TimelineViewController: TimelineLikeControllerDataSource {
         }
         
         let request = Client.getStatuses(timeline: timeline, range: range)
-        let statuses = try await mastodonController.run(request).0.compactMap(\.value)
+        let (statuses, _) = try await mastodonController.run(request)
         
         guard !statuses.isEmpty else {
             return []

Tusker/Screens/Utilities/CustomAlertController.swift

@@ -150,16 +150,9 @@ class CustomAlertActionsView: UIControl {
     private var separatorSizeConstraints: [NSLayoutConstraint] = []
     
     #if !os(visionOS)
-    private lazy var generator: UISelectionFeedbackGenerator = {
-        if #available(iOS 17.5, *) {
-            UISelectionFeedbackGenerator(view: self)
-        } else {
-            UISelectionFeedbackGenerator()
-        }
-    }()
+    private let generator = UISelectionFeedbackGenerator()
     #endif
     private var currentSelectedActionIndex: Int?
-    private var showPressedMenuWorkItem: DispatchWorkItem?
     
     init(config: CustomAlertController.Configuration, dismiss: @escaping () -> Void) {
         self.dismiss = dismiss
@@ -320,42 +313,13 @@ class CustomAlertActionsView: UIControl {
                     actionButtons[currentSelectedActionIndex].backgroundColor = nil
                 }
                 #if !os(visionOS)
-                if selectedButton != nil {
-                    if #available(iOS 17.5, *) {
-                        generator.selectionChanged(at: recognizer.location(in: generator.view))
-                    } else {
-                        generator.selectionChanged()
-                    }
-                }
+                generator.selectionChanged()
                 #endif
-                
-                if let showPressedMenuWorkItem {
-                    showPressedMenuWorkItem.cancel()
-                    self.showPressedMenuWorkItem = nil
-                }
             }
             
             currentSelectedActionIndex = selectedButton?.offset
             selectedButton?.element.backgroundColor = .secondarySystemFill
             
-            if let currentSelectedActionIndex,
-               case .menu(_) = reorderedActions[currentSelectedActionIndex].style,
-               case let button = actionButtons[currentSelectedActionIndex],
-               let interaction = button.contextMenuInteraction,
-               showPressedMenuWorkItem == nil {
-                showPressedMenuWorkItem = DispatchWorkItem {
-                    if #available(iOS 17.4, *) {
-                        button.performPrimaryAction()
-                    } else {
-                        let selector = NSSelectorFromString(["Location:", "At", "Menu", "present", "_"].reversed().joined())
-                        if interaction.responds(to: selector) {
-                            interaction.perform(selector, with: recognizer.location(in: button))
-                        }
-                    }
-                }
-                DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(250), execute: showPressedMenuWorkItem!)
-            }
-            
             #if !os(visionOS)
             generator.prepare()
             #endif

Tusker/Screens/Utilities/MultiColumnNavigationController.swift

@@ -8,26 +8,17 @@
 
 import UIKit
 
-/// View controllers, such as `UISearchController`, that live outside the normal VC hierarchy
-/// can adopt this protocol to indicate to `MultiColumnNavigationController` the context for
-/// navigation operations.
-protocol MultiColumnNavigationCustomTargetProviding {
-    var multiColumnNavigationTargetViewController: UIViewController? { get }
-}
-
 class MultiColumnNavigationController: UIViewController {
     
-    private var _viewControllers: [UIViewController] = []
-    var viewControllers: [UIViewController] {
-        get {
-            _viewControllers
-        }
-        set {
-            _viewControllers = newValue
-            if isViewLoaded {
-                updateViews()
-                scrollToEnd(animated: false)
+    private var isManuallyUpdating = false
+    var viewControllers: [UIViewController]  = [] {
+        didSet {
+            guard isViewLoaded,
+                  !isManuallyUpdating else {
+                return
             }
+            updateViews()
+            scrollToEnd(animated: false)
         }
     }
     
@@ -77,13 +68,13 @@ class MultiColumnNavigationController: UIViewController {
     
     private func updateViews() {
         var i = 0
-        while i < _viewControllers.count {
+        while i < viewControllers.count {
             let needsCloseButton = i > 0
             if i <= stackView.arrangedSubviews.count - 1 {
                 let existing = stackView.arrangedSubviews[i] as! ColumnView
-                existing.setContent(_viewControllers[i], needsCloseButton: needsCloseButton)
+                existing.setContent(viewControllers[i], needsCloseButton: needsCloseButton)
             } else {
-                let new = ColumnView(owner: self, contentViewController: _viewControllers[i], needsCloseButton: needsCloseButton)
+                let new = ColumnView(owner: self, contentViewController: viewControllers[i], needsCloseButton: needsCloseButton)
                 stackView.addArrangedSubview(new)
             }
             i += 1
@@ -101,11 +92,9 @@ class MultiColumnNavigationController: UIViewController {
             var index: Int? = nil
             var current: UIViewController? = sender
             while let c = current {
-                index = _viewControllers.firstIndex(of: c)
+                index = viewControllers.firstIndex(of: c)
                 if index != nil {
                     break
-                } else if let targetProviding = c as? MultiColumnNavigationCustomTargetProviding {
-                    current = targetProviding.multiColumnNavigationTargetViewController
                 } else {
                     current = c.parent
                 }
@@ -123,32 +112,24 @@ class MultiColumnNavigationController: UIViewController {
     }
     
     func replaceViewControllers(_ vcs: [UIViewController], after afterIndex: Int, animated: Bool) {
-        if afterIndex == _viewControllers.count - 1 && vcs.count == 1 {
+        if afterIndex == viewControllers.count - 1 && vcs.count == 1 {
             pushViewController(vcs[0], animated: animated)
         } else {
-            _viewControllers = Array(_viewControllers[...afterIndex]) + vcs
-            updateViews()
+            viewControllers = Array(viewControllers[...afterIndex]) + vcs
             scrollToEnd(animated: animated)
         }
     }
     
     private func scrollToEnd(animated: Bool) {
-        if _viewControllers.isEmpty {
+        if viewControllers.isEmpty {
             scrollView.setContentOffset(.init(x: -scrollView.adjustedLeadingContentInset, y: -scrollView.adjustedContentInset.top), animated: false)
         } else {
-            scrollColumnToEnd(columnIndex: _viewControllers.count - 1, animated: animated)
+            scrollColumnToEnd(columnIndex: viewControllers.count - 1, animated: animated)
         }
     }
     
     private func scrollColumnToEnd(columnIndex: Int, animated: Bool) {
-        // Laying out may change the content offset if we have fewer columns than before,
-        // but we want to keep the original offset so that we can animate smoothly to the final one.
-        let origContentOffset = scrollView.contentOffset
         scrollView.layoutIfNeeded()
-        if animated {
-            scrollView.contentOffset = origContentOffset
-        }
-        
         let column = stackView.arrangedSubviews[columnIndex]
         let columnFrame = column.convert(column.bounds, to: scrollView)
         let offset: CGFloat
@@ -161,12 +142,14 @@ class MultiColumnNavigationController: UIViewController {
     }
     
     fileprivate func closeColumn(_ vc: UIViewController) {
-        guard let index = _viewControllers.firstIndex(of: vc),
-              index > 0 else {
+        let index = viewControllers.firstIndex(of: vc)!
+        guard index > 0 else {
             // Can't close the last column
             return
         }
-        _viewControllers.removeSubrange(index...)
+        isManuallyUpdating = true
+        defer { isManuallyUpdating = false }
+        viewControllers.removeSubrange(index...)
         animateChanges {
             for column in self.stackView.arrangedSubviews[index...] {
                 column.layer.opacity = 0
@@ -175,6 +158,7 @@ class MultiColumnNavigationController: UIViewController {
         } completion: {
             self.updateViews()
         }
+
     }
     
     private func animateChanges(_ animations: @escaping () -> Void, completion: (() -> Void)? = nil) {
@@ -189,22 +173,19 @@ class MultiColumnNavigationController: UIViewController {
 
 extension MultiColumnNavigationController: NavigationControllerProtocol {
     var topViewController: UIViewController? {
-        _viewControllers.last
+        viewControllers.last
     }
     
     func popToRootViewController(animated: Bool) -> [UIViewController]? {
-        guard !_viewControllers.isEmpty else {
-            return nil
-        }
-        let removed = Array(_viewControllers.dropFirst())
-        _viewControllers = [_viewControllers.first!]
-        updateViews()
-        scrollToEnd(animated: animated)
+        let removed = Array(viewControllers.dropFirst())
+        viewControllers = [viewControllers.first!]
         return removed
     }
     
     func pushViewController(_ vc: UIViewController, animated: Bool) {
-        _viewControllers.append(vc)
+        isManuallyUpdating = true
+        defer { isManuallyUpdating = false }
+        viewControllers.append(vc)
         updateViews()
         scrollToEnd(animated: animated)
         if animated {
@@ -292,17 +273,12 @@ private class ColumnView: UIView {
     }
     
     private func installCloseBarButton(navigationItem: UINavigationItem) {
-        func makeItem() -> UIBarButtonItem {
-            let item = UIBarButtonItem(image: UIImage(systemName: "xmark"), style: .done, target: self, action: #selector(closeNavigationColumn))
-            item.accessibilityLabel = "Close Column"
-            return item
-        }
-        if let leftItems = navigationItem.leftBarButtonItems {
-            if !leftItems.contains(where: { $0.action == #selector(closeNavigationColumn) }) {
-                navigationItem.leftBarButtonItems!.insert(makeItem(), at: 0)
-            }
+        let item = UIBarButtonItem(image: UIImage(systemName: "xmark"), style: .done, target: self, action: #selector(closeNavigationColumn))
+        item.accessibilityLabel = "Close Column"
+        if navigationItem.leftBarButtonItems != nil {
+            navigationItem.leftBarButtonItems!.insert(item, at: 0)
         } else {
-            navigationItem.leftBarButtonItems = [makeItem()]
+            navigationItem.leftBarButtonItems = [item]
         }
     }
     

Tusker/Screens/Utilities/Previewing.swift

@@ -557,15 +557,11 @@ extension MenuActionProvider {
             return createAction(identifier: "block", title: "Unblock \(displayName)", systemImageName: "circle.slash", handler: handler(false))
         } else {
             let image = UIImage(systemName: "circle.slash")
-            var children = [
+            return UIMenu(title: "Block", image: image, children: [
                 UIAction(title: "Cancel", handler: { _ in }),
                 UIAction(title: "Block \(displayName)", image: image, attributes: .destructive, handler: handler(true)),
-            ]
-            if mastodonController.instanceFeatures.blockDomains,
-               host != mastodonController.account?.url.host {
-                children.append(UIAction(title: "Block \(host)", image: image, attributes: .destructive, handler: domainHandler(true)))
-            }
-            return UIMenu(title: "Block", image: image, children: children)
+                UIAction(title: "Block \(host)", image: image, attributes: .destructive, handler: domainHandler(true))
+            ])
         }
     }
     
@@ -596,8 +592,7 @@ extension MenuActionProvider {
     @MainActor
     private func hideReblogsAction(for relationship: RelationshipMO, mastodonController: MastodonController) -> UIMenuElement? {
         // don't show action for people that the user isn't following and isn't already hiding reblogs for
-        guard relationship.following || relationship.showingReblogs,
-              mastodonController.instanceFeatures.hideReblogs else {
+        guard relationship.following || relationship.showingReblogs else {
             return nil
         }
         let title = relationship.showingReblogs ? "Hide Reblogs" : "Show Reblogs"

Tusker/Screens/Utilities/UIViewController+Children.swift

@@ -50,11 +50,8 @@ extension UIViewController {
     }
     
     func removeViewAndController() {
-        beginAppearanceTransition(false, animated: false)
         view.removeFromSuperview()
-        willMove(toParent: nil)
         removeFromParent()
-        endAppearanceTransition()
     }
 }
 
@@ -71,7 +68,7 @@ extension UIView {
         
         if layout {
             subview.frame = bounds
-            subview.translatesAutoresizingMaskIntoConstraints = false
+            
             NSLayoutConstraint.activate([
                 subview.leadingAnchor.constraint(equalTo: leadingAnchor),
                 subview.trailingAnchor.constraint(equalTo: trailingAnchor),

Tusker/Shortcuts/AppShortcutItems.swift

@@ -44,9 +44,9 @@ enum AppShortcutItem: String, CaseIterable {
         }
         switch self {
         case .showHomeTimeline:
-            root.select(route: .timelines, animated: false, completion: nil)
+            root.select(route: .timelines, animated: false)
         case .showNotifications:
-            root.select(route: .notifications, animated: false, completion: nil)
+            root.select(route: .notifications, animated: false)
         case .composePost:
             root.compose(editing: nil, animated: false, isDucked: false)
         }

Tusker/Shortcuts/NSUserActivity+Extensions.swift

@@ -39,13 +39,12 @@ extension NSUserActivity {
         self.userInfo = [
             "accountID": accountID
         ]
-        self.targetContentIdentifier = accountID
     }
     
     @MainActor
-    func handleResume(manager: UserActivityManager) async -> Bool {
+    func handleResume(manager: UserActivityManager) -> Bool {
         guard let type = UserActivityType(rawValue: activityType) else { return false }
-        await type.handle(manager)(self)
+        type.handle(manager)(self)
         return true
     }
     

Tusker/Shortcuts/UserActivityHandlingContext.swift

@@ -16,8 +16,7 @@ import ComposeUI
 protocol UserActivityHandlingContext {
     var isHandoff: Bool { get }
     
-    func select(route: TuskerRoute) async
-    func select(route: TuskerRoute, completion: (() -> Void)?)
+    func select(route: TuskerRoute)
     func present(_ vc: UIViewController)
     
     var topViewController: UIViewController? { get }
@@ -29,16 +28,6 @@ protocol UserActivityHandlingContext {
     func finalize(activity: NSUserActivity)
 }
 
-extension UserActivityHandlingContext {
-    func select(route: TuskerRoute) async {
-        await withCheckedContinuation { continuation in
-            select(route: route) {
-                continuation.resume()
-            }
-        }
-    }
-}
-
 struct ActiveAccountUserActivityHandlingContext: UserActivityHandlingContext {
     let isHandoff: Bool
     let root: TuskerRootViewController
@@ -46,8 +35,8 @@ struct ActiveAccountUserActivityHandlingContext: UserActivityHandlingContext {
         root.getNavigationDelegate()!
     }
     
-    func select(route: TuskerRoute, completion: (() -> Void)?) {
-        root.select(route: route, animated: true, completion: completion)
+    func select(route: TuskerRoute) {
+        root.select(route: route, animated: true)
     }
     
     func present(_ vc: UIViewController) {
@@ -82,11 +71,9 @@ class StateRestorationUserActivityHandlingContext: UserActivityHandlingContext {
     
     var isHandoff: Bool { false }
     
-    func select(route: TuskerRoute, completion: (() -> Void)?) {
-        root.select(route: route, animated: false) {
-            self.state = .selectedRoute
-            completion?()
-        }
+    func select(route: TuskerRoute) {
+        root.select(route: route, animated: false)
+        state = .selectedRoute
     }
     
     var topViewController: UIViewController? { root.getNavigationController().topViewController }

Tusker/Shortcuts/UserActivityManager.swift

@@ -133,8 +133,8 @@ class UserActivityManager {
         return activity
     }
     
-    func handleCheckNotifications(activity: NSUserActivity) async {
-        await context.select(route: .notifications)
+    func handleCheckNotifications(activity: NSUserActivity) {
+        context.select(route: .notifications)
         context.popToRoot()
         if let notificationsPageController = context.topViewController as? NotificationsPageViewController {
             notificationsPageController.loadViewIfNeeded()
@@ -204,22 +204,22 @@ class UserActivityManager {
         return (timeline, positionInfo)
     }
     
-    func handleShowTimeline(activity: NSUserActivity) async {
+    func handleShowTimeline(activity: NSUserActivity) {
         guard let (timeline, positionInfo) = Self.getTimeline(from: activity) else { return }
         
         var timelineVC: TimelineViewController?
         if let pinned = PinnedTimeline(timeline: timeline),
            mastodonController.accountPreferences.pinnedTimelines.contains(pinned) {
-            await context.select(route: .timelines)
+            context.select(route: .timelines)
             context.popToRoot()
             let pageController = context.topViewController as! TimelinesPageViewController
             pageController.selectTimeline(pinned, animated: false)
             timelineVC = pageController.currentViewController as? TimelineViewController
         } else if case .list(let id) = timeline {
-            await context.select(route: .list(id: id))
+            context.select(route: .list(id: id))
             timelineVC = context.topViewController as? TimelineViewController
         } else {
-            await context.select(route: .explore)
+            context.select(route: .explore)
             context.popToRoot()
             timelineVC = TimelineViewController(for: timeline, mastodonController: mastodonController)
             context.push(timelineVC!)
@@ -249,11 +249,11 @@ class UserActivityManager {
         return activity.userInfo?["mainStatusID"] as? String
     }
     
-    func handleShowConversation(activity: NSUserActivity) async {
+    func handleShowConversation(activity: NSUserActivity) {
         guard let mainStatusID = Self.getConversationStatus(from: activity) else {
             return
         }
-        await context.select(route: .timelines)
+        context.select(route: .timelines)
         context.push(ConversationViewController(for: mainStatusID, state: .unknown, mastodonController: mastodonController))
     }
     
@@ -274,8 +274,8 @@ class UserActivityManager {
         return activity.userInfo?["query"] as? String
     }
     
-    func handleSearch(activity: NSUserActivity) async {
-        await context.select(route: .explore)
+    func handleSearch(activity: NSUserActivity) {
+        context.select(route: .explore)
         context.popToRoot()
         
         let searchController: UISearchController
@@ -311,8 +311,8 @@ class UserActivityManager {
         return activity
     }
     
-    func handleBookmarks(activity: NSUserActivity) async {
-        await context.select(route: .bookmarks)
+    func handleBookmarks(activity: NSUserActivity) {
+        context.select(route: .bookmarks)
     }
     
     // MARK: - My Profile
@@ -325,8 +325,8 @@ class UserActivityManager {
         return activity
     }
     
-    func handleMyProfile(activity: NSUserActivity) async {
-        await context.select(route: .myProfile)
+    func handleMyProfile(activity: NSUserActivity) {
+        context.select(route: .myProfile)
     }
     
     // MARK: - Show Profile
@@ -344,11 +344,11 @@ class UserActivityManager {
         return activity.userInfo?["profileID"] as? String
     }
     
-    func handleShowProfile(activity: NSUserActivity) async {
+    func handleShowProfile(activity: NSUserActivity) {
         guard let accountID = Self.getProfile(from: activity) else {
             return
         }
-        await context.select(route: .timelines)
+        context.select(route: .timelines)
         context.push(ProfileViewController(accountID: accountID, mastodonController: mastodonController))
     }
     
@@ -361,11 +361,11 @@ class UserActivityManager {
         return activity
     }
     
-    func handleShowNotification(activity: NSUserActivity) async {
+    func handleShowNotification(activity: NSUserActivity) {
         guard let notificationID = activity.userInfo?["notificationID"] as? String else {
             return
         }
-        await context.select(route: .notifications)
+        context.select(route: .notifications)
         context.push(NotificationLoadingViewController(notificationID: notificationID, mastodonController: mastodonController))
     }
     

Tusker/Shortcuts/UserActivityType.swift

@@ -23,7 +23,7 @@ enum UserActivityType: String {
 
 extension UserActivityType {
     @MainActor
-    var handle: (UserActivityManager) -> @MainActor (NSUserActivity) async -> Void {
+    var handle: (UserActivityManager) -> @MainActor (NSUserActivity) -> Void {
         switch self {
         case .mainScene:
             fatalError("cannot handle main scene activity")

Tusker/Views/AccountDisplayAndUserNameLabel.swift

@@ -1,57 +0,0 @@
-//
-//  AccountDisplayAndUserNameLabel.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 7/20/24.
-//  Copyright © 2024 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-import Pachyderm
-
-class AccountDisplayAndUserNameLabel: EmojiLabel {
-    var baseFont: UIFontDescriptor = .preferredFontDescriptor(withTextStyle: .body)
-    
-    private var state: State?
-    
-    func updateUI(account: some AccountProtocol) {
-        let state = State(accountID: account.id, displayName: account.displayName, acct: account.acct)
-        guard state != self.state || Preferences.shared.hideCustomEmojiInUsernames != hasEmojis else {
-            return
-        }
-        self.state = state
-        self.attributedText = makeAttributedText(state: state)
-        if Preferences.shared.hideCustomEmojiInUsernames {
-            self.removeEmojis()
-        } else {
-            self.setEmojis(account.emojis, identifier: state.accountID)
-        }
-    }
-    
-    private func makeAttributedText(state: State) -> NSAttributedString {
-        let s = NSMutableAttributedString()
-        s.append(NSAttributedString(string: state.displayName, attributes: [
-            .font: UIFont(descriptor: baseFont.addingAttributes([
-                .traits: [
-                    UIFontDescriptor.TraitKey.weight: UIFont.Weight.semibold.rawValue,
-                ]
-            ]), size: 0),
-        ]))
-        s.append(NSAttributedString(string: " "))
-        s.append(NSAttributedString(string: "@\(state.acct)", attributes: [
-            .font: UIFont(descriptor: baseFont.addingAttributes([
-                .traits: [
-                    UIFontDescriptor.TraitKey.weight: UIFont.Weight.light.rawValue,
-                ]
-            ]), size: 0),
-            .foregroundColor: UIColor.secondaryLabel,
-        ]))
-        return s
-    }
-    
-    private struct State: Equatable {
-        var accountID: String
-        var displayName: String
-        var acct: String
-    }
-}

Tusker/Views/AccountDisplayNameLabel.swift

@@ -16,7 +16,7 @@ class AccountDisplayNameLabel: EmojiLabel {
     private var accountDisplayName: String?
 
     func updateForAccountDisplayName(account: some AccountProtocol) {
-        guard accountID != account.id || accountDisplayName != account.displayName || Preferences.shared.hideCustomEmojiInUsernames != hasEmojis else {
+        guard accountID != account.id || accountDisplayName != account.displayName || Preferences.shared.hideCustomEmojiInUsernames == hasEmojis else {
             return
         }
         accountID = account.id

Tusker/Views/Attachments/AttachmentView.swift

@@ -380,8 +380,6 @@ class AttachmentView: GIFImageView {
         self.badgeContainer = stack
         stack.axis = .horizontal
         stack.spacing = 2
-        // badges should appear on top of any subsequently added views (e.g., gifv)
-        stack.layer.zPosition = 100
         stack.translatesAutoresizingMaskIntoConstraints = false
         
         let font = UIFontMetrics(forTextStyle: .caption1).scaledFont(for: .systemFont(ofSize: 13, weight: .bold))
@@ -513,7 +511,7 @@ extension AttachmentView: UIContextMenuInteractionDelegate {
             } else if self.attachment.kind == .gifv || self.attachment.kind == .video {
                 itemSource = VideoActivityItemSource(asset: AVAsset(url: self.attachment.url), url: self.attachment.url)
                 itemData = Task {
-                    try? await URLSession.appDefault.data(from: self.attachment.url).0
+                    try? await URLSession.shared.data(from: self.attachment.url).0
                 }
             } else {
                 return nil

Tusker/Views/Attachments/GifvController.swift

@@ -17,7 +17,6 @@ class GifvController {
     let player: AVPlayer
     
     private var isGrayscale = false
-    private var audioSessionToken: AudioSessionCoordinator.Token?
     
     let presentationSizeSubject = PassthroughSubject<CGSize, Never>()
     private var presentationSizeObservation: NSKeyValueObservation?
@@ -30,9 +29,7 @@ class GifvController {
         self.isGrayscale = Preferences.shared.grayscaleImages
         
         player.isMuted = true
-        #if os(visionOS)
-        player.preventsAutomaticBackgroundingDuringVideoPlayback = false
-        #else
+        #if !os(visionOS)
         player.preventsDisplaySleepDuringVideoPlayback = false
         #endif
         
@@ -44,19 +41,12 @@ class GifvController {
     
     func play() {
         if player.rate == 0 {
-            audioSessionToken = AudioSessionCoordinator.shared.beginPlayback(mode: .gifv) {
-                DispatchQueue.main.async {
-                    self.player.play()
-                }
-            }
+            player.play()
         }
     }
     
     func pause() {
         player.pause()
-        if let audioSessionToken {
-            AudioSessionCoordinator.shared.endPlayback(token: audioSessionToken)
-        }
     }
     
     private func updatePresentationSizeObservation() {

Tusker/Views/Attachments/GifvPlayerView.swift

@@ -22,7 +22,6 @@ class GifvPlayerView: UIView {
 
     let controller: GifvController
     private var presentationSizeCancellable: AnyCancellable?
-    private var wasPlayingWhenSceneBackgrounded = false
     
     override var intrinsicContentSize: CGSize {
         controller.item.presentationSize
@@ -46,30 +45,4 @@ class GifvPlayerView: UIView {
         fatalError("init(coder:) has not been implemented")
     }
     
-    override func willMove(toWindow newWindow: UIWindow?) {
-        super.willMove(toWindow: newWindow)
-        
-        if let oldWindow = window,
-           let oldScene = oldWindow.windowScene {
-            NotificationCenter.default.removeObserver(self, name: UIScene.didEnterBackgroundNotification, object: oldScene)
-            NotificationCenter.default.removeObserver(self, name: UIScene.willEnterForegroundNotification, object: oldScene)
-        }
-        
-        if let newWindow,
-           let newScene = newWindow.windowScene {
-            NotificationCenter.default.addObserver(self, selector: #selector(sceneDidEnterBackground), name: UIScene.didEnterBackgroundNotification, object: newScene)
-            NotificationCenter.default.addObserver(self, selector: #selector(sceneWillEnterForeground), name: UIScene.willEnterForegroundNotification, object: newScene)
-        }
-    }
-    
-    @objc private func sceneDidEnterBackground() {
-        wasPlayingWhenSceneBackgrounded = controller.player.rate > 0
-    }
-    
-    @objc private func sceneWillEnterForeground() {
-        if wasPlayingWhenSceneBackgrounded {
-            controller.play()
-        }
-    }
-    
 }

Tusker/Views/CachedImageView.swift

@@ -33,11 +33,6 @@ class CachedImageView: UIImageView {
         commonInit()
     }
     
-    deinit {
-        fetchTask?.cancel()
-        blurHashTask?.cancel()
-    }
-    
     private func commonInit() {
         NotificationCenter.default.addObserver(self, selector: #selector(preferencesChanged), name: .preferencesChanged, object: nil)
     }

Tusker/Views/ConfirmReblogStatusPreviewView.swift

@@ -13,7 +13,6 @@ class ConfirmReblogStatusPreviewView: UIView {
     private static let htmlConverter = HTMLConverter(
         font: .preferredFont(forTextStyle: .caption2),
         monospaceFont: UIFontMetrics(forTextStyle: .caption2).scaledFont(for: .monospacedSystemFont(ofSize: 17, weight: .regular)),
-        fontMetrics: UIFontMetrics(forTextStyle: .caption2),
         color: .label,
         paragraphStyle: .default
     )

Tusker/Views/ContentTextView.swift

@@ -25,7 +25,6 @@ class ContentTextView: LinkTextView, BaseEmojiLabel {
     private static let defaultBodyHTMLConverter = HTMLConverter(
         font: .preferredFont(forTextStyle: .body),
         monospaceFont: UIFontMetrics.default.scaledFont(for: .monospacedSystemFont(ofSize: 17, weight: .regular)),
-        fontMetrics: .default,
         color: .label,
         paragraphStyle: .default
     )
@@ -37,8 +36,6 @@ class ContentTextView: LinkTextView, BaseEmojiLabel {
     var emojiFont: UIFont = .preferredFont(forTextStyle: .body)
     var emojiTextColor: UIColor = .label
     
-    private let tapRecognizer = UITapGestureRecognizer()
-    
     // The link range currently being previewed
     private var currentPreviewedLinkRange: NSRange?
     // The preview created in the previewForHighlighting method, so that we can use the same one in previewForDismissing.
@@ -81,9 +78,8 @@ class ContentTextView: LinkTextView, BaseEmojiLabel {
         updateLinkUnderlineStyle()
         
         // the text view's builtin link interaction code is tied to isSelectable, so we need to use our own tap recognizer
-        tapRecognizer.addTarget(self, action: #selector(textTapped(_:)))
-        tapRecognizer.delegate = self
-        addGestureRecognizer(tapRecognizer)
+        let recognizer = UITapGestureRecognizer(target: self, action: #selector(textTapped(_:)))
+        addGestureRecognizer(recognizer)
         
         NotificationCenter.default.addObserver(self, selector: #selector(_updateLinkUnderlineStyle), name: UIAccessibility.buttonShapesEnabledStatusDidChangeNotification, object: nil)
         underlineTextLinksCancellable =
@@ -136,6 +132,12 @@ class ContentTextView: LinkTextView, BaseEmojiLabel {
     }
     
     @objc func textTapped(_ recognizer: UITapGestureRecognizer) {
+        // if there currently is a selection, deselct it on single-tap
+        if selectedRange.length > 0 {
+            // location doesn't matter since we are non-editable and the cursor isn't visible
+            selectedRange = NSRange(location: 0, length: 0)
+        }
+        
         let location = recognizer.location(in: self)
         if let (link, range) = getLinkAtPoint(location),
            link.scheme != dataDetectorsScheme {
@@ -382,25 +384,3 @@ extension ContentTextView: UIContextMenuInteractionDelegate {
         }
     }
 }
-
-extension ContentTextView: UIGestureRecognizerDelegate {
-    override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-        // NB: This method is both a gesture recognizer delegate method and a UIView method.
-        // We only want to prevent our own tap gesture recognizer from beginning, but don't
-        // want to interfere with any other gestures that may begin over this view.
-        if gestureRecognizer === tapRecognizer {
-            let location = gestureRecognizer.location(in: self)
-            if let (link, _) = getLinkAtPoint(location) {
-                if link.scheme == dataDetectorsScheme {
-                    return false
-                } else {
-                    return true
-                }
-            } else {
-                return false
-            }
-        } else {
-            return true
-        }
-    }
-}

Tusker/Views/Poll/PollOptionView.swift

@@ -14,7 +14,6 @@ class PollOptionView: UIView {
     private static let minHeight: CGFloat = 35
     private static let cornerRadius = 0.1 * minHeight
     private static let unselectedBackgroundColor = UIColor(white: 0.5, alpha: 0.25)
-    private static let hoveredBackgroundColor = UIColor(white: 0.35, alpha: 0.25)
     
     private(set) var label: EmojiLabel!
     @Lazy private var checkbox: PollOptionCheckboxView = PollOptionCheckboxView().configure {
@@ -34,12 +33,6 @@ class PollOptionView: UIView {
     private var labelLeadingToSelfConstraint: NSLayoutConstraint!
     private var fillViewWidthConstraint: NSLayoutConstraint?
     
-    var hovered: Bool = false {
-        didSet {
-            backgroundColor = hovered ? PollOptionView.hoveredBackgroundColor : PollOptionView.unselectedBackgroundColor
-        }
-    }
-    
     init() {
         super.init(frame: .zero)
         

Tusker/Views/Poll/PollOptionsView.swift

@@ -24,19 +24,12 @@ class PollOptionsView: UIControl {
     private var poll: Poll!
     private var animator: UIViewPropertyAnimator!
     private var currentSelectedOptionIndex: Int?
-    private var currentHoveredOptionIndex: Int?
     
-    static let animationDuration: TimeInterval = 0.1
-    static let scaledTransform = CGAffineTransform(scaleX: 0.95, y: 0.95)
+    private let animationDuration: TimeInterval = 0.1
+    private let scaledTransform = CGAffineTransform(scaleX: 0.95, y: 0.95)
     
     #if !os(visionOS)
-    private lazy var generator: UISelectionFeedbackGenerator = {
-        if #available(iOS 17.5, *) {
-            UISelectionFeedbackGenerator(view: self)
-        } else {
-            UISelectionFeedbackGenerator()
-        }
-    }()
+    private let generator = UISelectionFeedbackGenerator()
     #endif
     
     override var isEnabled: Bool {
@@ -66,8 +59,6 @@ class PollOptionsView: UIControl {
             stack.topAnchor.constraint(equalTo: topAnchor),
             stack.bottomAnchor.constraint(equalTo: bottomAnchor),
         ])
-        
-        addGestureRecognizer(UIHoverGestureRecognizer(target: self, action: #selector(hoverRecognized)))
     }
     
     required init?(coder: NSCoder) {
@@ -130,20 +121,6 @@ class PollOptionsView: UIControl {
         }
     }
     
-    private func optionView(at point: CGPoint) -> (PollOptionView, Int)? {
-        for (index, view) in options.enumerated() {
-            // don't use view.frame because it changes when a transform is applied
-            var frame = CGRect(x: 0, y: view.center.y - view.bounds.height / 2, width: view.bounds.width, height: view.bounds.height)
-            if index != options.count - 1 {
-                frame = frame.inset(by: UIEdgeInsets(top: 0, left: 0, bottom: -stack.spacing, right: 0))
-            }
-            if frame.contains(point) {
-                return (view, index)
-            }
-        }
-        return nil
-    }
-    
     // MARK: - UIControl
     
     override func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
@@ -155,21 +132,13 @@ class PollOptionsView: UIControl {
             if view.point(inside: touch.location(in: view), with: event) {
                 currentSelectedOptionIndex = index
                 
-                if animator?.isRunning == true {
-                    animator.stopAnimation(true)
-                }
-                animator = UIViewPropertyAnimator(duration: Self.animationDuration, curve: .easeInOut) {
-                    view.transform = Self.scaledTransform
-                    view.hovered = true
+                animator = UIViewPropertyAnimator(duration: animationDuration, curve: .easeInOut) {
+                    view.transform = self.scaledTransform
                 }
                 animator.startAnimation()
                 
                 #if !os(visionOS)
-                if #available(iOS 17.5, *) {
-                    generator.selectionChanged(at: view.center)
-                } else {
-                    generator.selectionChanged()
-                }
+                generator.selectionChanged()
                 generator.prepare()
                 #endif
                 
@@ -182,31 +151,30 @@ class PollOptionsView: UIControl {
     
     override func continueTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
         let location = touch.location(in: self)
-        let newIndexAndOption = optionView(at: location)
-        let newIndex = newIndexAndOption?.1
-        let option = newIndexAndOption?.0
-
+        var newIndex: Int? = nil
+        for (index, view) in options.enumerated() {
+            var frame = view.frame
+            if index != options.count - 1 {
+                frame = frame.inset(by: UIEdgeInsets(top: 0, left: 0, bottom: -stack.spacing, right: 0))
+            }
+            if frame.contains(location) {
+                newIndex = index
+                break
+            }
+        }
+        
         if newIndex != currentSelectedOptionIndex {
             currentSelectedOptionIndex = newIndex
             
-            if animator.isRunning {
-                animator.stopAnimation(true)
-            }
-            animator = UIViewPropertyAnimator(duration: Self.animationDuration, curve: .easeInOut) {
+            UIView.animate(withDuration: animationDuration, delay: 0, options: .curveEaseInOut) {
                 for (index, view) in self.options.enumerated() {
-                    view.transform = index == newIndex ? Self.scaledTransform : .identity
-                    view.hovered = index == newIndex
+                    view.transform = index == newIndex ? self.scaledTransform : .identity
                 }
             }
-            animator.startAnimation()
             
             #if !os(visionOS)
-            if let option {
-                if #available(iOS 17.5, *) {
-                    generator.selectionChanged(at: option.center)
-                } else {
-                    generator.selectionChanged()
-                }
+            if newIndex != nil {
+                generator.selectionChanged()
                 generator.prepare()
             }
             #endif
@@ -221,15 +189,14 @@ class PollOptionsView: UIControl {
         func selectOption() {
             guard let index = currentSelectedOptionIndex else { return }
             let option = options[index]
-            animator = UIViewPropertyAnimator(duration: Self.animationDuration, curve: .easeInOut) {
+            animator = UIViewPropertyAnimator(duration: animationDuration, curve: .easeInOut) {
                 option.transform = .identity
-                option.hovered = false
                 self.selectOption(option)
             }
             animator.startAnimation()
         }
         
-        if animator?.isRunning == true {
+        if animator.isRunning {
             animator.addCompletion { (_) in
                 selectOption()
             }
@@ -240,52 +207,12 @@ class PollOptionsView: UIControl {
     
     override func cancelTracking(with event: UIEvent?) {
         super.cancelTracking(with: event)
-        if animator?.isRunning == true {
-            animator.stopAnimation(true)
-        }
-        animator = UIViewPropertyAnimator(duration: Self.animationDuration, curve: .easeInOut) {
+        UIView.animate(withDuration: animationDuration, delay: 0, options: .curveEaseInOut) {
             for view in self.options {
                 view.transform = .identity
-                view.hovered = false
             }
         }
-        animator.startAnimation()
-    }
-    
-    @objc private func hoverRecognized(_ recognizer: UIHoverGestureRecognizer) {
-        guard let (option, index) = optionView(at: recognizer.location(in: self)) else {
-            return
-        }
-        switch recognizer.state {
-        case .began, .changed:
-            if index != currentHoveredOptionIndex {
-                let oldIndex = currentHoveredOptionIndex
-                currentHoveredOptionIndex = index
-                if animator?.isRunning == true {
-                    animator.stopAnimation(true)
-                }
-                animator = UIViewPropertyAnimator(duration: Self.animationDuration, curve: .easeInOut) {
-                    option.hovered = true
-                    if let oldIndex {
-                        self.options[oldIndex].hovered = false
-                    }
-                }
-                animator.startAnimation()
-            }
-        case .ended, .cancelled:
-            if let currentHoveredOptionIndex {
-                self.currentHoveredOptionIndex = nil
-                if animator?.isRunning == true {
-                    animator.stopAnimation(true)
-                }
-                animator = UIViewPropertyAnimator(duration: Self.animationDuration, curve: .easeInOut) {
-                    self.options[currentHoveredOptionIndex].hovered = false
-                }
-                animator.startAnimation()
-            }
-        default:
-            break
-        }
+
     }
 
 }

Tusker/Views/Poll/StatusPollView.swift

@@ -65,7 +65,6 @@ class StatusPollView: UIView, StatusContentView {
         addSubview(infoLabel)
         
         voteButton = UIButton(configuration: .plain())
-        voteButton.isPointerInteractionEnabled = true
         voteButton.translatesAutoresizingMaskIntoConstraints = false
         voteButton.addTarget(self, action: #selector(votePressed), for: .touchUpInside)
         voteButton.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)

Tusker/Views/Profile Header/ProfileFieldValueView.swift

@@ -12,24 +12,20 @@ import SwiftUI
 import SafariServices
 
 class ProfileFieldValueView: UIView {
-    weak var navigationDelegate: TuskerNavigationDelegate? {
-        didSet {
-            textView.navigationDelegate = navigationDelegate
-        }
-    }
+    weak var navigationDelegate: TuskerNavigationDelegate?
     
     private static let converter = HTMLConverter(
         font: .preferredFont(forTextStyle: .body),
         monospaceFont: UIFontMetrics.default.scaledFont(for: .monospacedSystemFont(ofSize: 17, weight: .regular)),
-        fontMetrics: .default,
         color: .label,
         paragraphStyle: .default
     )
     
     private let account: AccountMO
     private let field: Account.Field
+    private var link: (String, URL)?
     
-    private let textView = ContentTextView()
+    private let label = EmojiLabel()
     private var iconView: UIView?
     
     private var currentTargetedPreview: UITargetedPreview?
@@ -42,28 +38,34 @@ class ProfileFieldValueView: UIView {
         
         let converted = NSMutableAttributedString(attributedString: ProfileFieldValueView.converter.convert(field.value))
         
-        #if os(visionOS)
-        textView.linkTextAttributes = [
-            .foregroundColor: UIColor.link
-        ]
-        #else
-        textView.linkTextAttributes = [
-            .foregroundColor: UIColor.tintColor
-        ]
-        #endif
-        textView.backgroundColor = nil
-        textView.isScrollEnabled = false
-        textView.isSelectable = false
-        textView.isEditable = false
-        textView.font = .preferredFont(forTextStyle: .body)
-        updateTextContainerInset()
-        textView.adjustsFontForContentSizeCategory = true
-        textView.attributedText = converted
-        textView.setEmojis(account.emojis, identifier: account.id)
-        textView.isUserInteractionEnabled = true
-        textView.setContentCompressionResistancePriority(.required, for: .vertical)
-        textView.translatesAutoresizingMaskIntoConstraints = false
-        addSubview(textView)
+        var range = NSRange(location: 0, length: 0)
+        if converted.length != 0,
+           let url = converted.attribute(.link, at: 0, longestEffectiveRange: &range, in: converted.fullRange) as? URL {
+            link = (converted.attributedSubstring(from: range).string, url)
+            label.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(linkTapped)))
+            label.addInteraction(UIContextMenuInteraction(delegate: self))
+            label.isUserInteractionEnabled = true
+            
+            converted.enumerateAttribute(.link, in: converted.fullRange) { value, range, stop in
+                guard value != nil else { return }
+                #if os(visionOS)
+                converted.addAttribute(.foregroundColor, value: UIColor.link, range: range)
+                #else
+                converted.addAttribute(.foregroundColor, value: UIColor.tintColor, range: range)
+                #endif
+                // the .link attribute in a UILabel always makes the color blue >.>
+                converted.removeAttribute(.link, range: range)
+            }
+        }
+        
+        label.numberOfLines = 0
+        label.font = .preferredFont(forTextStyle: .body)
+        label.adjustsFontForContentSizeCategory = true
+        label.attributedText = converted
+        label.setEmojis(account.emojis, identifier: account.id)
+        label.setContentCompressionResistancePriority(.required, for: .vertical)
+        label.translatesAutoresizingMaskIntoConstraints = false
+        addSubview(label)
         
         let labelTrailingConstraint: NSLayoutConstraint
         
@@ -80,20 +82,20 @@ class ProfileFieldValueView: UIView {
             icon.isPointerInteractionEnabled = true
             icon.accessibilityLabel = "Verified link"
             addSubview(icon)
-            labelTrailingConstraint = textView.trailingAnchor.constraint(equalTo: icon.leadingAnchor)
+            labelTrailingConstraint = label.trailingAnchor.constraint(equalTo: icon.leadingAnchor)
             NSLayoutConstraint.activate([
-                icon.centerYAnchor.constraint(equalTo: textView.centerYAnchor),
+                icon.centerYAnchor.constraint(equalTo: label.centerYAnchor),
                 icon.trailingAnchor.constraint(lessThanOrEqualTo: trailingAnchor),
             ])
         } else {
-            labelTrailingConstraint = textView.trailingAnchor.constraint(equalTo: trailingAnchor)
+            labelTrailingConstraint = label.trailingAnchor.constraint(equalTo: trailingAnchor)
         }
         
         NSLayoutConstraint.activate([
-            textView.leadingAnchor.constraint(equalTo: leadingAnchor),
+            label.leadingAnchor.constraint(equalTo: leadingAnchor),
             labelTrailingConstraint,
-            textView.topAnchor.constraint(equalTo: topAnchor),
-            textView.bottomAnchor.constraint(equalTo: bottomAnchor),
+            label.topAnchor.constraint(equalTo: topAnchor),
+            label.bottomAnchor.constraint(equalTo: bottomAnchor),
         ])
     }
     
@@ -102,36 +104,37 @@ class ProfileFieldValueView: UIView {
     }
     
     override func sizeThatFits(_ size: CGSize) -> CGSize {
-        var size = textView.sizeThatFits(size)
+        var size = label.sizeThatFits(size)
         if let iconView {
             size.width += iconView.sizeThatFits(UIView.layoutFittingCompressedSize).width
         }
         return size
     }
     
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        if traitCollection.preferredContentSizeCategory != previousTraitCollection?.preferredContentSizeCategory {
-            updateTextContainerInset()
-        }
-    }
-    
-    private func updateTextContainerInset() {
-        // blergh
-        switch traitCollection.preferredContentSizeCategory {
-        case .extraSmall:
-            textView.textContainerInset = UIEdgeInsets(top: 4, left: 0, bottom: 0, right: 0)
-        case .small:
-            textView.textContainerInset = UIEdgeInsets(top: 3, left: 0, bottom: 0, right: 0)
-        case .medium, .large:
-            textView.textContainerInset = UIEdgeInsets(top: 2, left: 0, bottom: 0, right: 0)
-        default:
-            textView.textContainerInset = .zero
-        }
-    }
-    
     func setTextAlignment(_ alignment: NSTextAlignment) {
-        textView.textAlignment = alignment
+        label.textAlignment = alignment
+    }
+    
+    func getHashtagOrURL() -> (Hashtag?, URL)? {
+        guard let (text, url) = link else {
+            return nil
+        }
+        if text.starts(with: "#") {
+            return (Hashtag(name: String(text.dropFirst()), url: url), url)
+        } else {
+            return (nil, url)
+        }
+    }
+    
+    @objc private func linkTapped() {
+        guard let (hashtag, url) = getHashtagOrURL() else {
+            return
+        }
+        if let hashtag {
+            navigationDelegate?.selected(tag: hashtag)
+        } else {
+            navigationDelegate?.selected(url: url)
+        }
     }
     
     @objc private func verifiedIconTapped() {
@@ -141,7 +144,7 @@ class ProfileFieldValueView: UIView {
         let view = ProfileFieldVerificationView(
             acct: account.acct,
             verifiedAt: field.verifiedAt!,
-            linkText: textView.text ?? "",
+            linkText: label.text ?? "",
             navigationDelegate: navigationDelegate
         )
         let host = UIHostingController(rootView: view)
@@ -165,3 +168,49 @@ class ProfileFieldValueView: UIView {
         navigationDelegate.present(toPresent, animated: true)
     }
 }
+
+extension ProfileFieldValueView: UIContextMenuInteractionDelegate, MenuActionProvider {
+    func contextMenuInteraction(_ interaction: UIContextMenuInteraction, configurationForMenuAtLocation location: CGPoint) -> UIContextMenuConfiguration? {
+        guard let (hashtag, url) = getHashtagOrURL(),
+              let navigationDelegate else {
+            return nil
+        }
+        if let hashtag {
+            return UIContextMenuConfiguration {
+                HashtagTimelineViewController(for: hashtag, mastodonController: navigationDelegate.apiController)
+            } actionProvider: { _ in
+                UIMenu(children: self.actionsForHashtag(hashtag, source: .view(self)))
+            }
+        } else {
+            return UIContextMenuConfiguration {
+                let vc = SFSafariViewController(url: url)
+                #if !os(visionOS)
+                vc.preferredControlTintColor = Preferences.shared.accentColor.color
+                #endif
+                return vc
+            } actionProvider: { _ in
+                UIMenu(children: self.actionsForURL(url, source: .view(self)))
+            }
+        }
+    }
+    
+    
+    func contextMenuInteraction(_ interaction: UIContextMenuInteraction, configuration: UIContextMenuConfiguration, highlightPreviewForItemWithIdentifier identifier: NSCopying) -> UITargetedPreview? {
+        var rect = label.textRect(forBounds: label.bounds, limitedToNumberOfLines: 0)
+        // the rect should be vertically centered, but textRect doesn't seem to take the label's vertical alignment into account
+        rect.origin.x = 0
+        rect.origin.y = (bounds.height - rect.height) / 2
+        let parameters = UIPreviewParameters(textLineRects: [rect as NSValue])
+        let preview = UITargetedPreview(view: label, parameters: parameters)
+        currentTargetedPreview = preview
+        return preview
+    }
+    
+    func contextMenuInteraction(_ interaction: UIContextMenuInteraction, configuration: UIContextMenuConfiguration, dismissalPreviewForItemWithIdentifier identifier: NSCopying) -> UITargetedPreview? {
+        return currentTargetedPreview
+    }
+    
+    func contextMenuInteraction(_ interaction: UIContextMenuInteraction, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating) {
+        MenuPreviewHelper.willPerformPreviewAction(animator: animator, presenter: navigationDelegate!)
+    }
+}

Tusker/Views/Profile Header/ProfileHeaderMovedOverlayView.swift

@@ -14,8 +14,7 @@ class ProfileHeaderMovedOverlayView: UIView {
     weak var delegate: TuskerNavigationDelegate?
     
     var collapse: (() -> Void)?
-    var hide: (() -> Void)?
-
+    
     private var avatarImageView: CachedImageView!
     private var displayNameLabel: EmojiLabel!
     private var usernameLabel: UILabel!
@@ -145,46 +144,7 @@ class ProfileHeaderMovedOverlayView: UIView {
     @objc private func accountTapped() {
         delegate?.selected(account: movedToID)
     }
-    
-    // MARK: Accessibility
-    
-    override var isAccessibilityElement: Bool {
-        get { true }
-        set {}
-    }
-    
-    override var accessibilityLabel: String? {
-        get {
-            guard let movedToID,
-                  let account = delegate?.apiController?.persistentContainer.account(for: movedToID) else {
-                return "This account has moved"
-            }
-            return "This account has moved to @\(account.acct)"
-        }
-        set {}
-    }
-    
-    override func accessibilityActivate() -> Bool {
-        guard let movedToID,
-              let delegate else {
-            return false
-        }
-        delegate.selected(account: movedToID)
-        return true
-    }
-    
-    override var accessibilityCustomActions: [UIAccessibilityCustomAction]? {
-        get {
-            [
-                UIAccessibilityCustomAction(name: "Hide banner", actionHandler: { [unowned self] _ in
-                    self.hide?()
-                    return true
-                })
-            ]
-        }
-        set {}
-    }
-    
+
 }
 
 extension ProfileHeaderMovedOverlayView: UIPointerInteractionDelegate {

Tusker/Views/Profile Header/ProfileHeaderView.swift

@@ -25,9 +25,9 @@ class ProfileHeaderView: UIView {
     weak var delegate: ProfileHeaderViewDelegate?
     var mastodonController: MastodonController! { delegate?.apiController }
 
-    @IBOutlet weak var headerImageView: CachedImageView!
+    @IBOutlet weak var headerImageView: UIImageView!
     @IBOutlet weak var avatarContainerView: UIView!
-    @IBOutlet weak var avatarImageView: CachedImageView!
+    @IBOutlet weak var avatarImageView: UIImageView!
     @IBOutlet weak var moreButton: ProfileHeaderButton!
     @IBOutlet weak var followButton: ProfileHeaderButton!
     @IBOutlet weak var displayNameLabel: AccountDisplayNameLabel!
@@ -41,10 +41,11 @@ class ProfileHeaderView: UIView {
     @IBOutlet weak var followersCountButton: UIButton!
     private(set) var pagesSegmentedControl: ScrollingSegmentedControl<ProfileViewController.Page>!
     private var movedOverlayView: ProfileHeaderMovedOverlayView?
-    private var hideMovedOverlayView = false
     
     var accountID: String!
     
+    private var imagesTask: Task<Void, Never>?
+    
     private var isGrayscale = false
     private var followButtonMode = FollowButtonMode.follow {
         didSet {
@@ -55,6 +56,10 @@ class ProfileHeaderView: UIView {
         }
     }
     
+    deinit {
+        imagesTask?.cancel()
+    }
+    
     override func awakeFromNib() {
         super.awakeFromNib()
         
@@ -64,13 +69,11 @@ class ProfileHeaderView: UIView {
         avatarContainerView.layer.cornerCurve = .continuous
         // Set zPositions so the gallery presentation/dismissal animation looks correct.
         avatarContainerView.layer.zPosition = 2
-        avatarImageView.cache = .avatars
         avatarImageView.layer.masksToBounds = true
         avatarImageView.layer.cornerCurve = .continuous
         avatarImageView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(avatarPressed)))
         avatarImageView.isUserInteractionEnabled = true
         
-        headerImageView.cache = .headers
         headerImageView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(headerPressed)))
         headerImageView.isUserInteractionEnabled = true
         headerImageView.layer.zPosition = 1
@@ -135,11 +138,11 @@ class ProfileHeaderView: UIView {
         usernameLabel.text = "@\(account.acct)"
         lockImageView.isHidden = !account.locked
         
-        if let avatar = account.avatar {
-            avatarImageView.update(for: avatar)
-        }
-        if let header = account.header {
-            headerImageView.update(for: header)
+        imagesTask?.cancel()
+        let avatar = account.avatar
+        let header = account.header
+        imagesTask = Task {
+            await updateImages(avatar: avatar, header: header)
         }
         
         moreButton.menu = UIMenu(title: "", image: nil, identifier: nil, options: [], children: delegate?.actionsForProfile(accountID: accountID, source: .view(moreButton), fetchRelationship: false) ?? [])
@@ -179,8 +182,7 @@ class ProfileHeaderView: UIView {
         followersCountButton.setAttributedTitle(followersCountTitle, for: .normal)
         followersCountButton.accessibilityLabel = "\(followersSpelledOut) followers"
         
-        if let movedTo = account.movedTo,
-           !hideMovedOverlayView {
+        if let movedTo = account.movedTo {
             if let movedOverlayView {
                 movedOverlayView.updateUI(movedTo: movedTo)
             } else {
@@ -209,7 +211,6 @@ class ProfileHeaderView: UIView {
     
     private func createMovedOverlayView(movedTo: AccountMO) -> ProfileHeaderMovedOverlayView {
         let overlay = ProfileHeaderMovedOverlayView()
-        overlay.layer.zPosition = 1000
         overlay.delegate = delegate
         overlay.updateUI(movedTo: movedTo)
         overlay.translatesAutoresizingMaskIntoConstraints = false
@@ -237,12 +238,6 @@ class ProfileHeaderView: UIView {
             }
             animator.startAnimation()
         }
-        overlay.hide = { [weak self] in
-            guard let self else { return }
-            self.hideMovedOverlayView = true
-            self.updateUI(for: self.accountID)
-            UIAccessibility.post(notification: .layoutChanged, argument: self)
-        }
         
         return overlay
     }
@@ -299,6 +294,44 @@ class ProfileHeaderView: UIView {
         avatarContainerView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarContainerView)
         avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarImageView)
         displayNameLabel.updateForAccountDisplayName(account: account)
+        
+        if isGrayscale != Preferences.shared.grayscaleImages {
+            isGrayscale = Preferences.shared.grayscaleImages
+            imagesTask?.cancel()
+            let avatar = account.avatar
+            let header = account.header
+            imagesTask = Task {
+                await updateImages(avatar: avatar, header: header)
+            }
+        }
+    }
+    
+    private nonisolated func updateImages(avatar: URL?, header: URL?) async {
+        await withTaskGroup(of: Void.self) { group in
+            group.addTask {
+                guard let avatar,
+                      let image = await ImageCache.avatars.get(avatar, loadOriginal: true).1,
+                      let transformedImage = await ImageGrayscalifier.convertIfNecessary(url: avatar, image: image),
+                      !Task.isCancelled else {
+                    return
+                }
+                await MainActor.run {
+                    self.avatarImageView.image = transformedImage
+                }
+            }
+            group.addTask {
+                guard let header,
+                      let image = await ImageCache.avatars.get(header, loadOriginal: true).1,
+                      let transformedImage = await ImageGrayscalifier.convertIfNecessary(url: header, image: image),
+                      !Task.isCancelled else {
+                    return
+                }
+                await MainActor.run {
+                    self.headerImageView.image = transformedImage
+                }
+            }
+            await group.waitForAll()
+        }
     }
     
     private func formatBigNumber(_ value: Int) -> (String, String) {

Tusker/Views/Profile Header/ProfileHeaderView.xib

@@ -3,7 +3,7 @@
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -14,7 +14,7 @@
         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iN0-l3-epB" customClass="ProfileHeaderView" customModule="Tusker" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="dgG-dR-lSv" customClass="CachedImageView" customModule="Tusker" customModuleProvider="target">
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="dgG-dR-lSv">
                     <rect key="frame" x="0.0" y="48" width="414" height="150"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="150" id="aCE-CA-XWm"/>
@@ -23,7 +23,7 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wT9-2J-uSY">
                     <rect key="frame" x="16" y="138" width="120" height="120"/>
                     <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="TkY-oK-if4" customClass="CachedImageView" customModule="Tusker" customModuleProvider="target">
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="TkY-oK-if4">
                             <rect key="frame" x="2" y="2" width="116" height="116"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="116" id="eDg-Vc-o8R"/>
@@ -93,7 +93,7 @@
                         <stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="udp-EN-wtc">
                             <rect key="frame" x="0.0" y="575.5" width="218.5" height="20.5"/>
                             <subviews>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5w9-LA-8kc">
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5w9-LA-8kc">
                                     <rect key="frame" x="0.0" y="0.0" width="104" height="20.5"/>
                                     <state key="normal" title="Button"/>
                                     <buttonConfiguration key="configuration" style="plain" title="123 Following">
@@ -104,7 +104,7 @@
                                         <action selector="followingCountButtonPressed:" destination="iN0-l3-epB" eventType="touchUpInside" id="QOO-zK-pfu"/>
                                     </connections>
                                 </button>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" pointerInteraction="YES" id="XCX-Y3-cG5">
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" id="XCX-Y3-cG5">
                                     <rect key="frame" x="112" y="0.0" width="106.5" height="20.5"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <state key="normal" title="Button"/>

Tusker/Views/ScrollingSegmentedControl.swift

@@ -24,13 +24,7 @@ class ScrollingSegmentedControl<Value: Hashable>: UIScrollView, UIGestureRecogni
     private var changeSelectionPanRecognizer: UIGestureRecognizer!
     private var selectedOptionAtStartOfPan: Value?
     #if !os(visionOS)
-    private lazy var selectionChangedFeedbackGenerator: UISelectionFeedbackGenerator = {
-        if #available(iOS 17.5, *) {
-            UISelectionFeedbackGenerator(view: self)
-        } else {
-            UISelectionFeedbackGenerator()
-        }
-    }()
+    private lazy var selectionChangedFeedbackGenerator = UISelectionFeedbackGenerator()
     #endif
     
     override var intrinsicContentSize: CGSize {
@@ -117,19 +111,13 @@ class ScrollingSegmentedControl<Value: Hashable>: UIScrollView, UIGestureRecogni
     
     func setSelectedOption(_ value: Value, animated: Bool) {
         guard selectedOption != value,
-              let index = options.firstIndex(where: { $0.value == value }) else {
+              options.contains(where: { $0.value == value }) else {
             return
         }
         
         #if !os(visionOS)
         if selectedOption != nil {
-            if #available(iOS 17.5, *) {
-                let optionView = optionsStack.arrangedSubviews[index]
-                let location = convert(CGPoint(x: optionView.bounds.midX, y: optionView.bounds.midY), from: optionView)
-                selectionChangedFeedbackGenerator.selectionChanged(at: location)
-            } else {
-                selectionChangedFeedbackGenerator.selectionChanged()
-            }
+            selectionChangedFeedbackGenerator.selectionChanged()
         }
         #endif
         
@@ -170,19 +158,15 @@ class ScrollingSegmentedControl<Value: Hashable>: UIScrollView, UIGestureRecogni
     // MARK: Interaction
     
     override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-        guard gestureRecognizer === self.panGestureRecognizer else {
-            return true
-        }
-        
         let beganOnSelectedOption: Bool
         if let selectedIndex = options.firstIndex(where: { $0.value == selectedOption }),
-           optionsStack.arrangedSubviews[selectedIndex].frame.contains(gestureRecognizer.location(in: optionsStack)) {
+           optionsStack.arrangedSubviews[selectedIndex].frame.contains(self.panGestureRecognizer.location(in: optionsStack)) {
             beganOnSelectedOption = true
         } else {
             beganOnSelectedOption = false
         }
         
-        // only begin changing selection if the gesture started on the currently selected item
+        // only begin changing selection if the gesutre started on the currently selected item
         // otherwise, let the scroll view handle things
         if gestureRecognizer == self.changeSelectionPanRecognizer {
             return beganOnSelectedOption
@@ -239,12 +223,7 @@ class ScrollingSegmentedControl<Value: Hashable>: UIScrollView, UIGestureRecogni
                 }
                 animator.startAnimation()
                 #if !os(visionOS)
-                if #available(iOS 17.5, *) {
-                    let locationInSelf = convert(location, from: optionsStack)
-                    selectionChangedFeedbackGenerator.selectionChanged(at: locationInSelf)
-                } else {
-                    selectionChangedFeedbackGenerator.selectionChanged()
-                }
+                selectionChangedFeedbackGenerator.selectionChanged()
                 #endif
                 return true
             } else {

Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift

@@ -20,7 +20,6 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
     private static let htmlConverter = HTMLConverter(
         font: ConversationMainStatusCollectionViewCell.contentFont,
         monospaceFont: ConversationMainStatusCollectionViewCell.monospaceFont,
-        fontMetrics: .default,
         color: .label,
         paragraphStyle: ConversationMainStatusCollectionViewCell.contentParagraphStyle
     )
@@ -515,15 +514,8 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
         return contentContainer.estimateVisibleSubviewHeight(effectiveWidth: width)
     }
     
-    func updateAccountUI(account: AccountMO) {
-        baseUpdateAccountUI(account: account)
-        displayNameLabel.updateForAccountDisplayName(account: account)
-        usernameLabel.text = "@\(account.acct)"
-    }
-    
     func updateUIForPreferences(status: StatusMO) {
         baseUpdateUIForPreferences(status: status)
-        displayNameLabel.updateForAccountDisplayName(account: status.account)
     }
     
     @objc private func preferencesChanged() {
@@ -648,7 +640,7 @@ extension ConversationMainStatusCollectionViewCell: UIPointerInteractionDelegate
             return defaultRegion
         } else if let button = interaction.view as? UIButton,
                   actionButtons.contains(button) {
-            var rect = button.convert(button.imageView!.bounds, from: button.imageView!)
+            var rect = button.convert(button.imageView!.bounds, to: button.imageView!)
             rect = rect.insetBy(dx: -24, dy: -24)
             return UIPointerRegion(rect: rect)
         }
@@ -662,8 +654,8 @@ extension ConversationMainStatusCollectionViewCell: UIPointerInteractionDelegate
         } else if let button = interaction.view as? UIButton,
                   actionButtons.contains(button) {
             let preview = UITargetedPreview(view: button.imageView!)
-            var rect = button.convert(button.imageView!.bounds, from: button.imageView!)
-            rect = rect.insetBy(dx: -8, dy: -8)
+            var rect = button.convert(button.imageView!.bounds, to: button.imageView!)
+            rect = rect.insetBy(dx: -24, dy: -24)
             return UIPointerStyle(effect: .highlight(preview), shape: .roundedRect(rect))
         }
         return nil