CHANGELOG-release.md

@@ -1,20 +1,3 @@
-## 2024.2
-This release introduces push notifications as well as an enhanced multi-column interface on iPadOS!
-
-Features/Improvements:
-- Push notifications
-- Add post preview to Appearance preferences
-- Show instance announcements in Notifications tab
-- Add subscription option to Tip Jar
-- iPadOS: Multi-column navigation
-- Pleroma/Akkoma: Emoji reaction notifications
-
-Bugfixes:
-- Fix fetching server info on some instances
-- Fix attachment captions not displaying while loading in gallery
-- macOS: Remove in-app Safari preferences
-- Pleroma: Handle posts with missing creation date
-
 ## 2024.1
 This update includes a significant improvements for the attachment gallery and displaying rich text posts. See below for a full list of improvements and fixes.
 

CHANGELOG.md

@@ -1,46 +1,5 @@
 # Changelog
 
-## 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)
-Features/Improvements:
-- Add subscription option to Tip Jar
-
-Bugfixes:
-- Fix attachment captions not displaying while loading in gallery
-- Fix tapping follow request push notification not working
-- Pleroma: Handle posts with missing creation dates
-
 ## 2024.2 (122)
 Features/Improvements:
 - Show instance announcements in Notifications

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)

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/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/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,7 @@ 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"))
             }
         })
         
@@ -204,8 +204,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 +456,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 +491,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

@@ -36,7 +36,6 @@
 		D60E2F2E244248BF005F8713 /* MastodonCachePersistentStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60E2F2D244248BF005F8713 /* MastodonCachePersistentStore.swift */; };
 		D6114E0D27F7FEB30080E273 /* TrendingStatusesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E0C27F7FEB30080E273 /* TrendingStatusesViewController.swift */; };
 		D6114E1127F899B30080E273 /* TrendingLinksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E1027F899B30080E273 /* TrendingLinksViewController.swift */; };
-		D6187BED2BFA840B00B3A281 /* FollowRequestNotificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6187BEC2BFA840B00B3A281 /* FollowRequestNotificationViewController.swift */; };
 		D61A45E628DC0F2F002BE511 /* ConfirmLoadMoreCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61A45E528DC0F2F002BE511 /* ConfirmLoadMoreCollectionViewCell.swift */; };
 		D61A45E828DF477D002BE511 /* LoadingCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61A45E728DF477D002BE511 /* LoadingCollectionViewCell.swift */; };
 		D61A45EA28DF51EE002BE511 /* TimelineLikeCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61A45E928DF51EE002BE511 /* TimelineLikeCollectionViewController.swift */; };
@@ -75,7 +74,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 */; };
@@ -97,7 +95,7 @@
 		D630C3CA2BC59FF500208903 /* MastodonController+Push.swift in Sources */ = {isa = PBXBuildFile; fileRef = D630C3C92BC59FF500208903 /* MastodonController+Push.swift */; };
 		D630C3CC2BC5FD4600208903 /* GetAuthorizationTokenService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D630C3CB2BC5FD4600208903 /* GetAuthorizationTokenService.swift */; };
 		D630C3D42BC61B6100208903 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D630C3D32BC61B6100208903 /* NotificationService.swift */; };
-		D630C3D82BC61B6100208903 /* NotificationExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D630C3D12BC61B6000208903 /* NotificationExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		D630C3D82BC61B6100208903 /* NotificationExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D630C3D12BC61B6000208903 /* NotificationExtension.appex */; platformFilters = (ios, maccatalyst, ); settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		D630C3DF2BC61C4900208903 /* PushNotifications in Frameworks */ = {isa = PBXBuildFile; productRef = D630C3DE2BC61C4900208903 /* PushNotifications */; };
 		D630C3E12BC61C6700208903 /* UserAccounts in Frameworks */ = {isa = PBXBuildFile; productRef = D630C3E02BC61C6700208903 /* UserAccounts */; };
 		D630C3E52BC6313400208903 /* Pachyderm in Frameworks */ = {isa = PBXBuildFile; productRef = D630C3E42BC6313400208903 /* Pachyderm */; };
@@ -259,7 +257,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 */; };
@@ -470,7 +467,6 @@
 		D60E2F2D244248BF005F8713 /* MastodonCachePersistentStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonCachePersistentStore.swift; sourceTree = "<group>"; };
 		D6114E0C27F7FEB30080E273 /* TrendingStatusesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingStatusesViewController.swift; sourceTree = "<group>"; };
 		D6114E1027F899B30080E273 /* TrendingLinksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingLinksViewController.swift; sourceTree = "<group>"; };
-		D6187BEC2BFA840B00B3A281 /* FollowRequestNotificationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowRequestNotificationViewController.swift; sourceTree = "<group>"; };
 		D61A45E528DC0F2F002BE511 /* ConfirmLoadMoreCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmLoadMoreCollectionViewCell.swift; sourceTree = "<group>"; };
 		D61A45E728DF477D002BE511 /* LoadingCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingCollectionViewCell.swift; sourceTree = "<group>"; };
 		D61A45E928DF51EE002BE511 /* TimelineLikeCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineLikeCollectionViewController.swift; sourceTree = "<group>"; };
@@ -508,7 +504,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>"; };
@@ -688,7 +683,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>"; };
@@ -1053,7 +1047,6 @@
 				D608470E2A245D1F00C17380 /* ActiveInstance.swift */,
 				D60E2F2D244248BF005F8713 /* MastodonCachePersistentStore.swift */,
 				D6B936702829F72900237D0E /* NSManagedObjectContext+Helpers.swift */,
-				D6A8D7A42C14DB280007B285 /* PersistentHistoryTokenStore.swift */,
 			);
 			path = CoreData;
 			sourceTree = "<group>";
@@ -1171,7 +1164,6 @@
 				D646DCD92A081A2C0059ECEB /* PollFinishedNotificationCollectionViewCell.swift */,
 				D646DCDB2A081CF10059ECEB /* StatusUpdatedNotificationCollectionViewCell.swift */,
 				D68245112BCA1F4000AFB38B /* NotificationLoadingViewController.swift */,
-				D6187BEC2BFA840B00B3A281 /* FollowRequestNotificationViewController.swift */,
 			);
 			path = Notifications;
 			sourceTree = "<group>";
@@ -1762,7 +1754,6 @@
 				D6DD8FFC298495A8002AD3FD /* LogoutService.swift */,
 				D6D79F252A0C8D2700AB2315 /* FetchStatusSourceService.swift */,
 				D630C3CB2BC5FD4600208903 /* GetAuthorizationTokenService.swift */,
-				D6210D752C0B924F009BB569 /* RemoveProfileSuggestionService.swift */,
 			);
 			path = API;
 			sourceTree = "<group>";
@@ -2243,7 +2234,6 @@
 				D65A261D2BC39399005EB5D8 /* PushInstanceSettingsView.swift in Sources */,
 				D65C6BF525478A9C00A6E89C /* BackgroundableViewController.swift in Sources */,
 				D61DC84D28F500D200B82C6E /* ProfileViewController.swift in Sources */,
-				D6187BED2BFA840B00B3A281 /* FollowRequestNotificationViewController.swift in Sources */,
 				D600891F29848DE2005B4D00 /* AddInstancePinnedTimelineView.swift in Sources */,
 				D693A72F25CF91C6003A14E2 /* FeaturedProfileCollectionViewCell.swift in Sources */,
 				D627943223A5466600D38C68 /* SelectableTableViewCell.swift in Sources */,
@@ -2368,7 +2358,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 */,
@@ -2415,7 +2404,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 */,
 			);
@@ -2680,8 +2668,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";
@@ -2984,8 +2971,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";
@@ -3016,8 +3002,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";
@@ -3252,7 +3237,7 @@
 			repositoryURL = "https://git.shadowfacts.net/shadowfacts/HTMLStreamer.git";
 			requirement = {
 				kind = exactVersion;
-				version = 0.2.4;
+				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

@@ -185,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))")
@@ -290,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/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/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/ConversationViewController.swift

@@ -222,7 +222,7 @@ class ConversationViewController: UIViewController {
             }
         }
         if isLikelyMastodonRemoteStatus(url: url),
-           let (_, response) = try? await URLSession.appDefault.data(from: url, delegate: RedirectBlocker()),
+           let (_, response) = try? await URLSession.shared.data(from: url, delegate: RedirectBlocker()),
            let location = (response as? HTTPURLResponse)?.value(forHTTPHeaderField: "location") {
             effectiveURL = location
         } else {
@@ -232,7 +232,7 @@ class ConversationViewController: UIViewController {
         let request = Client.search(query: effectiveURL, types: [.statuses], resolve: true)
         do {
             let (results, _) = try await mastodonController.run(request)
-            guard let status = results.statuses.compactMap(\.value).first(where: { $0.url?.serialized() == effectiveURL }) else {
+            guard let status = results.statuses.first(where: { $0.url?.serialized() == effectiveURL }) else {
                 throw UnableToResolveError()
             }
             _ = mastodonController.persistentContainer.addOrUpdateOnViewContext(status: status)

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/Gallery/ImageGalleryDataSource.swift

@@ -42,7 +42,7 @@ class ImageGalleryDataSource: GalleryDataSource {
                 gifController: gifController
             )
         } else {
-            return LoadingGalleryContentViewController(caption: nil) {
+            return LoadingGalleryContentViewController {
                 let (data, image) = await self.cache.get(self.url, loadOriginal: true)
                 if let image {
                     let gifController: GIFController? =

Tusker/Screens/Gallery/LoadingGalleryContentViewController.swift

@@ -10,7 +10,6 @@ import UIKit
 import GalleryVC
 
 class LoadingGalleryContentViewController: UIViewController, GalleryContentViewController {
-    private let fallbackCaption: String?
     private let provider: () async -> (any GalleryContentViewController)?
     private var wrapped: (any GalleryContentViewController)!
     
@@ -25,15 +24,14 @@ class LoadingGalleryContentViewController: UIViewController, GalleryContentViewC
     }
     
     var caption: String? {
-        wrapped?.caption ?? fallbackCaption
+        wrapped?.caption
     }
     
     var canAnimateFromSourceView: Bool {
         wrapped?.canAnimateFromSourceView ?? true
     }
     
-    init(caption: String?, provider: @escaping () async -> (any GalleryContentViewController)?) {
-        self.fallbackCaption = caption
+    init(provider: @escaping () async -> (any GalleryContentViewController)?) {
         self.provider = provider
         
         super.init(nibName: nil, bundle: nil)

Tusker/Screens/Gallery/StatusAttachmentsGalleryDataSource.swift

@@ -57,8 +57,7 @@ class StatusAttachmentsGalleryDataSource: GalleryDataSource {
                     gifController: gifController
                 )
             } else {
-                return LoadingGalleryContentViewController(caption: attachment.description) {
-                    try! await Task.sleep(nanoseconds: NSEC_PER_SEC)
+                return LoadingGalleryContentViewController {
                     let (data, image) = await ImageCache.attachments.get(attachment.url, loadOriginal: true)
                     if let image {
                         let gifController: GIFController? =
@@ -96,9 +95,9 @@ class StatusAttachmentsGalleryDataSource: GalleryDataSource {
             // TODO: use separate content VC with audio visualization?
             return VideoGalleryContentViewController(url: attachment.url, caption: attachment.description)
         case .unknown:
-            return LoadingGalleryContentViewController(caption: nil) {
+            return LoadingGalleryContentViewController {
                 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,8 +256,10 @@ 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 {

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)
 }
 
@@ -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
@@ -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()
     }
@@ -473,7 +471,7 @@ extension MainSidebarViewController: UICollectionViewDelegate {
                 fatalError("unreachable")
             }
         } else {
-            sidebarDelegate?.sidebar(self, didSelectItem: item, previousItem: previouslySelectedItem)
+            sidebarDelegate?.sidebar(self, didSelectItem: item)
         }
     }
     
@@ -542,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() {
@@ -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]
     }
@@ -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
         }
@@ -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? {
@@ -617,7 +610,7 @@ extension MainSplitViewController: TuskerRootViewController {
         }
         
         if sidebar.selectedItem != .explore {
-            select(newItem: .explore, oldItem: sidebar.selectedItem)
+            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/FollowRequestNotificationViewController.swift

@@ -1,144 +0,0 @@
-//
-//  FollowRequestNotificationViewController.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 5/19/24.
-//  Copyright © 2024 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-import Pachyderm
-
-class FollowRequestNotificationViewController: UIViewController, CollectionViewController {
-    
-    private let mastodonController: MastodonController
-    private let notification: Pachyderm.Notification
-    
-    var collectionView: UICollectionView! {
-        view as? UICollectionView
-    }
-    private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
-    
-    init(notification: Pachyderm.Notification, mastodonController: MastodonController) {
-        precondition(notification.kind == .followRequest)
-        self.mastodonController = mastodonController
-        self.notification = notification
-        
-        super.init(nibName: nil, bundle: nil)
-        
-        title = "Follow Request"
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    override func loadView() {
-        let layout = UICollectionViewCompositionalLayout { sectionIndex, environment in
-            var config = UICollectionLayoutListConfiguration(appearance: .grouped)
-            config.backgroundColor = .appGroupedBackground
-            let section = NSCollectionLayoutSection.list(using: config, layoutEnvironment: environment)
-            section.readableContentInset(in: environment)
-            return section
-        }
-        view = UICollectionView(frame: .zero, collectionViewLayout: layout)
-        collectionView.delegate = self
-        collectionView.dragDelegate = self
-        collectionView.allowsFocus = true
-        dataSource = createDataSource()
-    }
-    
-    private func createDataSource() -> UICollectionViewDiffableDataSource<Section, Item> {
-        let followRequestCell = UICollectionView.CellRegistration<FollowRequestNotificationCollectionViewCell, Void> { [unowned self] cell, indexPath, itemIdentifier in
-            cell.delegate = self
-            cell.updateUI(notification: self.notification)
-        }
-        return UICollectionViewDiffableDataSource(collectionView: collectionView) { collectionView, indexPath, itemIdentifier in
-            return collectionView.dequeueConfiguredReusableCell(using: followRequestCell, for: indexPath, item: ())
-        }
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
-        snapshot.appendSections([.notifications])
-        snapshot.appendItems([.notification])
-        dataSource.apply(snapshot, animatingDifferences: false)
-    }
-    
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        
-        clearSelectionOnAppear(animated: animated)
-    }
-}
-
-extension FollowRequestNotificationViewController {
-    enum Section {
-        case notifications
-    }
-    enum Item {
-        case notification
-    }
-}
-
-extension FollowRequestNotificationViewController: UICollectionViewDelegate {
-    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        selected(account: notification.account.id)
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {
-        guard let cell = collectionView.cellForItem(at: indexPath) else {
-            return nil
-        }
-        let accountID = notification.account.id
-        return UIContextMenuConfiguration {
-            ProfileViewController(accountID: accountID, mastodonController: self.mastodonController)
-        } actionProvider: { _ in
-            let cell = cell as! FollowRequestNotificationCollectionViewCell
-            let acceptRejectChildren = [
-                UIAction(title: "Accept", image: UIImage(systemName: "checkmark.circle"), handler: { _ in cell.acceptButtonPressed() }),
-                UIAction(title: "Reject", image: UIImage(systemName: "xmark.circle"), handler: { _ in cell.rejectButtonPressed() }),
-            ]
-            let acceptRejectMenu: UIMenu
-            if #available(iOS 16.0, *) {
-                acceptRejectMenu = UIMenu(options: .displayInline, preferredElementSize: .medium, children: acceptRejectChildren)
-            } else {
-                acceptRejectMenu = UIMenu(options: .displayInline, children: acceptRejectChildren)
-            }
-            return UIMenu(children: [
-                acceptRejectMenu,
-                UIMenu(options: .displayInline, children: self.actionsForProfile(accountID: accountID, source: .view(cell))),
-            ])
-        }
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: any UIContextMenuInteractionCommitAnimating) {
-        MenuPreviewHelper.willPerformPreviewAction(animator: animator, presenter: self)
-    }
-}
-
-extension FollowRequestNotificationViewController: UICollectionViewDragDelegate {
-    func collectionView(_ collectionView: UICollectionView, itemsForBeginning session: any UIDragSession, at indexPath: IndexPath) -> [UIDragItem] {
-        let provider = NSItemProvider(object: notification.account.url as NSURL)
-        let activity = UserActivityManager.showProfileActivity(id: notification.account.id, accountID: mastodonController.accountInfo!.id)
-        activity.displaysAuxiliaryScene = true
-        provider.registerObject(activity, visibility: .all)
-        return [UIDragItem(itemProvider: provider)]
-    }
-}
-
-extension FollowRequestNotificationViewController: TuskerNavigationDelegate {
-    var apiController: MastodonController! { mastodonController }
-}
-
-extension FollowRequestNotificationViewController: MenuActionProvider {
-}
-
-extension FollowRequestNotificationViewController: StatusBarTappableViewController {
-    func handleStatusBarTapped(xPosition: CGFloat) -> StatusBarTapActionResult {
-        collectionView.scrollToTop()
-        return .stop
-    }
-}

Tusker/Screens/Notifications/NotificationLoadingViewController.swift

@@ -89,7 +89,8 @@ class NotificationLoadingViewController: UIViewController {
         case .follow:
             vc = ProfileViewController(accountID: notification.account.id, mastodonController: mastodonController)
         case .followRequest:
-            vc = FollowRequestNotificationViewController(notification: notification, mastodonController: mastodonController)
+            // todo
+            return
         case .unknown:
             showLoadingError(Error.unknownType)
             return

Tusker/Screens/Preferences/Notifications/NotificationsPrefsView.swift

@@ -17,15 +17,6 @@ struct NotificationsPrefsView: View {
     
     var body: some View {
         List {
-            NavigationLink {
-                TipJarView()
-            } label: {
-                Text("Push notifications are available for free to all users, but providing them has an ongoing cost. If you like the app, please consider \(Text("supporting Tusker").foregroundColor(.accentColor)).")
-                    .font(.callout)
-                    .foregroundStyle(.secondary)
-            }
-            .listRowBackground(Color.accentColor.opacity(0.1))
-            
             Section {
                 ForEach(userAccounts.accounts) { account in
                     PushInstanceSettingsView(account: account)

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

@@ -11,24 +11,18 @@ import StoreKit
 import Combine
 
 struct TipJarView: View {
-    private static let tipProductIDs = [
+    private static let productIDs = [
         "tusker.tip.small",
         "tusker.tip.medium",
         "tusker.tip.large",
     ]
-    private static let supporterProductIDs = [
-        "tusker.supporter.regular",
-    ]
     
     @State private var isLoaded = false
-    @State private var tipProducts: [(Product, Bool)] = []
-    @State private var supporterProducts: [(Product, Bool)] = []
+    @State private var products: [(Product, Bool)] = []
     @State private var error: Error?
     @State private var showConfetti = false
     @State private var updatesObserver: Task<Void, Never>?
-    @State private var tipButtonWidth: CGFloat?
-    @State private var supporterButtonWidth: CGFloat?
-    @State private var supporterStartDate: Date?
+    @State private var buttonWidth: CGFloat?
     @StateObject private var observer = UbiquitousKeyValueStoreObserver()
     
     var body: some View {
@@ -53,20 +47,9 @@ struct TipJarView: View {
             updatesObserver = Task.detached { @MainActor in
                 await observeTransactionUpdates()
             }
-            for await verificationResult in Transaction.currentEntitlements {
-                if case .verified(let transaction) = verificationResult,
-                   Self.supporterProductIDs.contains(transaction.productID),
-                   await transaction.subscriptionStatus?.state == .subscribed {
-                    supporterStartDate = transaction.originalPurchaseDate
-                    break
-                }
-            }
             do {
-                let allProducts = try await Product.products(for: Self.tipProductIDs + Self.supporterProductIDs).map { ($0, false) }
-                tipProducts = allProducts.filter { Self.tipProductIDs.contains($0.0.id) }
-                tipProducts.sort(by: { $0.0.price < $1.0.price })
-                supporterProducts = allProducts.filter { Self.supporterProductIDs.contains($0.0.id) }
-                supporterProducts.sort(by: { $0.0.price < $1.0.price })
+                products = try await Product.products(for: Self.productIDs).map { ($0, false) }
+                products.sort(by: { $0.0.price < $1.0.price })
                 isLoaded = true
             } catch {
                 self.error = .fetchingProducts(error)
@@ -84,17 +67,25 @@ struct TipJarView: View {
     private var productsView: some View {
         if isLoaded {
             VStack {
-                if !supporterProducts.isEmpty {
-                    supporterSubscriptions
+                Text("If you're enjoying using Tusker and want to show your gratitude or help support its development, it is greatly appreciated!")
+                    .multilineTextAlignment(.center)
+                    .padding(.horizontal)
+                
+                VStack(alignment: .myAlignment) {
+                    ForEach($products, id: \.0.id) { $productAndPurchasing in
+                        TipRow(product: productAndPurchasing.0, buttonWidth: buttonWidth, isPurchasing: $productAndPurchasing.1, showConfetti: $showConfetti)
+                    }
+                }
+                .onPreferenceChange(ButtonWidthKey.self) { newValue in
+                    if let buttonWidth {
+                        self.buttonWidth = max(buttonWidth, newValue)
+                    } else {
+                        self.buttonWidth = newValue
+                    }
                 }
                 
-                tipPurchases
-                
-                if let tipStatus {
-                    tipStatus
-                        .multilineTextAlignment(.center)
-                        .padding(.horizontal)
-                        .padding(.top, 16)
+                if let total = getTotalTips(), total > 0 {
+                    Text("You've tipped a total of \(Text(total, format: products[0].0.priceFormatStyle)) 😍")
                     Text("Thank you!")
                 }
             }
@@ -104,92 +95,19 @@ struct TipJarView: View {
         }
     }
     
-    @ViewBuilder
-    private var supporterSubscriptions: some View {
-        Text("If you want to contribute Tusker's continued development, you can become a supporter. Supporting Tusker is an auto-renewable monthly subscription.")
-            .multilineTextAlignment(.center)
-            .padding(.horizontal)
-        
-        VStack(alignment: .myAlignment) {
-            ForEach($supporterProducts, id: \.0.id) { $productAndPurchasing in
-                TipRow(product: productAndPurchasing.0, buttonWidth: supporterButtonWidth, isPurchasing: $productAndPurchasing.1, showConfetti: $showConfetti)
-            }
-        }
-        .onPreferenceChange(ButtonWidthKey.self) { newValue in
-            if let supporterButtonWidth {
-                self.supporterButtonWidth = max(supporterButtonWidth, newValue)
-            } else {
-                self.supporterButtonWidth = newValue
-            }
-        }
-    }
-    
-    @ViewBuilder
-    private var tipPurchases: some View {
-        Text("Or, you can choose to make a one-time tip to show your gratitutde or help support the app's development. It is greatly appreciated!")
-            .multilineTextAlignment(.center)
-            .padding(.horizontal)
-            .padding(.top, 16)
-
-        VStack(alignment: .myAlignment) {
-            ForEach($tipProducts, id: \.0.id) { $productAndPurchasing in
-                TipRow(product: productAndPurchasing.0, buttonWidth: tipButtonWidth, isPurchasing: $productAndPurchasing.1, showConfetti: $showConfetti)
-            }
-        }
-        .onPreferenceChange(ButtonWidthKey.self) { newValue in
-            if let tipButtonWidth {
-                self.tipButtonWidth = max(tipButtonWidth, newValue)
-            } else {
-                self.tipButtonWidth = newValue
-            }
-        }
-    }
-    
-    private var tipStatus: Text? {
-        var text: Text?
-        if let supporterStartDate {
-            var months = Calendar.current.dateComponents([.month], from: supporterStartDate, to: Date()).month!
-            // the user has already paid for n months before the nth month has finished, so reflect that
-            months += 1
-            text = Text("You've been a supporter for ^[\(months) months](inflect: true)")
-        }
-        if let total = getTotalTips(),
-           total > 0 {
-            if let t = text {
-                text = Text("\(t) and tipped \(total.formatted(tipProducts[0].0.priceFormatStyle))")
-            } else {
-                text = Text("You've tipped \(total.formatted(tipProducts[0].0.priceFormatStyle))")
-            }
-        }
-        if let text {
-            return Text("\(text) 😍")
-        } else {
-            return nil
-        }
-    }
-    
     @MainActor
     private func observeTransactionUpdates() async {
         for await verificationResult in StoreKit.Transaction.updates {
-            if let index = tipProducts.firstIndex(where: { $0.0.id == verificationResult.unsafePayloadValue.productID }) {
-                switch verificationResult {
-                case .verified(let transaction):
-                    await transaction.finish()
-                    self.tipProducts[index].1 = false
-                    self.showConfetti = true
-                case .unverified(_, let error):
-                    self.error = .verifyingTransaction(error)
-                }
-            } else if let index = supporterProducts.firstIndex(where: { $0.0.id == verificationResult.unsafePayloadValue.productID }) {
-                switch verificationResult {
-                case .verified(let transaction):
-                    await transaction.finish()
-                    self.supporterProducts[index].1 = false
-                    self.showConfetti = true
-                    self.supporterStartDate = transaction.originalPurchaseDate
-                case .unverified(_, let error):
-                    self.error = .verifyingTransaction(error)
-                }
+            guard let index = products.firstIndex(where: { $0.0.id == verificationResult.unsafePayloadValue.productID }) else {
+                continue
+            }
+            switch verificationResult {
+            case .verified(let transaction):
+                await transaction.finish()
+                self.products[index].1 = false
+                self.showConfetti = true
+            case .unverified(_, let error):
+                self.error = .verifyingTransaction(error)
             }
         }
     }
@@ -231,11 +149,25 @@ private struct TipRow: View {
             Text(product.displayName)
                 .alignmentGuide(.myAlignment, computeValue: { context in context[.trailing] })
             
-            if let subscription = product.subscription {
-                SubscriptionButton(product: product, subscriptionInfo: subscription, isPurchasing: $isPurchasing, buttonWidth: buttonWidth, purchase: purchase)
-            } else {
-                tipButton
+            Button {
+                Task {
+                    await self.purchase()
+                }
+            } label: {
+                if isPurchasing {
+                    ProgressView()
+                        .progressViewStyle(.circular)
+                        .frame(width: buttonWidth, alignment: .center)
+                } else {
+                    Text(product.displayPrice)
+                        .background(GeometryReader { proxy in
+                            Color.clear
+                                .preference(key: ButtonWidthKey.self, value: proxy.size.width)
+                        })
+                        .frame(width: buttonWidth)
+                }
             }
+            .buttonStyle(.borderedProminent)
         }
         .alertWithData("Error", data: $error) { _ in
             Button("OK") {}
@@ -244,28 +176,6 @@ private struct TipRow: View {
         }
     }
     
-    private var tipButton: some View {
-        Button {
-            Task {
-                await self.purchase()
-            }
-        } label: {
-            if isPurchasing {
-                ProgressView()
-                    .progressViewStyle(.circular)
-                    .frame(width: buttonWidth, alignment: .center)
-            } else {
-                Text(product.displayPrice)
-                    .background(GeometryReader { proxy in
-                        Color.clear
-                            .preference(key: ButtonWidthKey.self, value: proxy.size.width)
-                    })
-                    .frame(width: buttonWidth)
-            }
-        }
-        .buttonStyle(.borderedProminent)
-    }
-    
     @MainActor
     private func purchase() async {
         isPurchasing = true
@@ -311,71 +221,6 @@ private struct TipRow: View {
     }
 }
 
-private struct SubscriptionButton: View {
-    let product: Product
-    let subscriptionInfo: Product.SubscriptionInfo
-    @Binding var isPurchasing: Bool
-    let buttonWidth: CGFloat?
-    let purchase: () async -> Void
-    @State private var hasPurchased = false
-    @State private var showManageSheet = false
-    
-    var body: some View {
-        Button {
-            if #available(iOS 17.0, *), hasPurchased {
-                showManageSheet = true
-            } else {
-                Task {
-                    await purchase()
-                    await updateHasPurchased()
-                }
-            }
-        } label: {
-            if #available(iOS 17.0, *), hasPurchased {
-                Text("Manage")
-            } else if isPurchasing {
-                ProgressView()
-                    .progressViewStyle(.circular)
-                    .frame(width: buttonWidth, alignment: .center)
-            } else {
-                let per: String = if subscriptionInfo.subscriptionPeriod.value == 1, subscriptionInfo.subscriptionPeriod.unit == .month {
-                    "mo"
-                } else {
-                    subscriptionInfo.subscriptionPeriod.formatted(product.subscriptionPeriodFormatStyle)
-                }
-                Text("\(product.displayPrice)/\(per)")
-                    .background(GeometryReader { proxy in
-                        Color.clear
-                            .preference(key: ButtonWidthKey.self, value: proxy.size.width)
-                    })
-                    .frame(width: buttonWidth)
-            }
-        }
-        .buttonStyle(.borderedProminent)
-        .task {
-            await updateHasPurchased()
-        }
-        .onChange(of: showManageSheet) {
-            if !$0 {
-                Task {
-                    await updateHasPurchased()
-                }
-            }
-        }
-        .manageSubscriptionsSheetIfAvailable(isPresented: $showManageSheet, subscriptionGroupID: subscriptionInfo.subscriptionGroupID)
-    }
-    
-    private func updateHasPurchased() async {
-        switch await Transaction.currentEntitlement(for: product.id) {
-        case .verified(let transaction):
-            let state = await transaction.subscriptionStatus?.state
-            hasPurchased = state == .subscribed
-        default:
-            break
-        }
-    }
-}
-
 extension HorizontalAlignment {
     private enum MyTrailing: AlignmentID {
         static func defaultValue(in context: ViewDimensions) -> CGFloat {
@@ -418,16 +263,3 @@ 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, *) {
-            self.manageSubscriptionsSheet(isPresented: isPresented, subscriptionGroupID: subscriptionGroupID)
-        } else {
-            self
-        }
-    }
-}

Tusker/Screens/Profile/ProfileStatusesViewController.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: "ProfileStatusesViewController")
 
 class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionViewController, CollectionViewController {
     
@@ -256,16 +250,9 @@ class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionVie
         state = .setupInitialSnapshot
         
         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 (all, _) = try? await mastodonController.run(Client.getRelationships(accounts: [accountID])),
+               let relationship = all.first {
+                self.mastodonController.persistentContainer.addOrUpdate(relationship: relationship)
             }
         }
         
@@ -310,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) {
@@ -526,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)
@@ -539,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)
@@ -559,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
@@ -580,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/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/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)

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/MultiColumnNavigationController.swift

@@ -8,28 +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 isManuallyUpdating = false
-    private var _viewControllers: [UIViewController] = []
-    var viewControllers: [UIViewController] {
-        get {
-            _viewControllers
-        }
-        set {
-            _viewControllers = newValue
-            if isViewLoaded,
-               !isManuallyUpdating {
-                updateViews()
-                scrollToEnd(animated: false)
+    var viewControllers: [UIViewController]  = [] {
+        didSet {
+            guard isViewLoaded,
+                  !isManuallyUpdating else {
+                return
             }
+            updateViews()
+            scrollToEnd(animated: false)
         }
     }
     
@@ -79,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
@@ -103,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
                 }
@@ -125,20 +112,19 @@ 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)
         }
     }
     
@@ -156,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
@@ -170,6 +158,7 @@ class MultiColumnNavigationController: UIViewController {
         } completion: {
             self.updateViews()
         }
+
     }
     
     private func animateChanges(_ animations: @escaping () -> Void, completion: (() -> Void)? = nil) {
@@ -184,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 {
@@ -287,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/Tusker.storekit

@@ -53,94 +53,13 @@
   "settings" : {
     "_applicationInternalID" : "1498334597",
     "_developerTeamID" : "V4WK9KR9U2",
-    "_failTransactionsEnabled" : false,
-    "_lastSynchronizedDate" : 737914663.21114194,
-    "_storeKitErrors" : [
-      {
-        "current" : null,
-        "enabled" : false,
-        "name" : "Load Products"
-      },
-      {
-        "current" : null,
-        "enabled" : false,
-        "name" : "Purchase"
-      },
-      {
-        "current" : null,
-        "enabled" : false,
-        "name" : "Verification"
-      },
-      {
-        "current" : null,
-        "enabled" : false,
-        "name" : "App Store Sync"
-      },
-      {
-        "current" : null,
-        "enabled" : false,
-        "name" : "Subscription Status"
-      },
-      {
-        "current" : null,
-        "enabled" : false,
-        "name" : "App Transaction"
-      },
-      {
-        "current" : null,
-        "enabled" : false,
-        "name" : "Manage Subscriptions Sheet"
-      },
-      {
-        "current" : null,
-        "enabled" : false,
-        "name" : "Refund Request Sheet"
-      },
-      {
-        "current" : null,
-        "enabled" : false,
-        "name" : "Offer Code Redeem Sheet"
-      }
-    ]
+    "_lastSynchronizedDate" : 696310076.23998904
   },
   "subscriptionGroups" : [
-    {
-      "id" : "21490109",
-      "localizations" : [
 
-      ],
-      "name" : "Tip Jar",
-      "subscriptions" : [
-        {
-          "adHocOffers" : [
-
-          ],
-          "codeOffers" : [
-
-          ],
-          "displayPrice" : "1.99",
-          "familyShareable" : false,
-          "groupNumber" : 1,
-          "internalID" : "6502909920",
-          "introductoryOffer" : null,
-          "localizations" : [
-            {
-              "description" : "Support the continued development of Tusker!",
-              "displayName" : "Tusker Supporter",
-              "locale" : "en_US"
-            }
-          ],
-          "productID" : "tusker.supporter.regular",
-          "recurringSubscriptionPeriod" : "P1M",
-          "referenceName" : "tusker.supporter.regular",
-          "subscriptionGroupID" : "21490109",
-          "type" : "RecurringSubscription"
-        }
-      ]
-    }
   ],
   "version" : {
-    "major" : 3,
+    "major" : 2,
     "minor" : 0
   }
 }

Tusker/Views/Attachments/AttachmentView.swift

@@ -511,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/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/ContentTextView.swift

@@ -36,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.
@@ -80,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 =
@@ -135,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 {
@@ -381,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/Profile Header/ProfileFieldValueView.swift

@@ -12,11 +12,7 @@ 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),
@@ -27,8 +23,9 @@ class ProfileFieldValueView: UIView {
     
     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?
@@ -41,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.textContainerInset = .zero
-        textView.font = .preferredFont(forTextStyle: .body)
-        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
         
@@ -79,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),
         ])
     }
     
@@ -101,7 +104,7 @@ 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
         }
@@ -109,7 +112,29 @@ class ProfileFieldValueView: UIView {
     }
     
     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() {
@@ -119,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)
@@ -143,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/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!
@@ -44,6 +44,8 @@ class ProfileHeaderView: UIView {
     
     var accountID: String!
     
+    private var imagesTask: Task<Void, Never>?
+    
     private var isGrayscale = false
     private var followButtonMode = FollowButtonMode.follow {
         didSet {
@@ -54,6 +56,10 @@ class ProfileHeaderView: UIView {
         }
     }
     
+    deinit {
+        imagesTask?.cancel()
+    }
+    
     override func awakeFromNib() {
         super.awakeFromNib()
         
@@ -63,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
@@ -134,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) ?? [])
@@ -290,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/Status/ConversationMainStatusCollectionViewCell.swift

@@ -640,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)
         }
@@ -654,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

Tusker/Views/Status/StatusCollectionViewCell.swift

@@ -256,7 +256,6 @@ extension StatusCollectionViewCell {
                 view.backgroundColor = .tintColor.withAlphaComponent(0.5)
                 view.layer.cornerRadius = 2.5
                 view.layer.maskedCorners = [.layerMinXMaxYCorner, .layerMaxXMaxYCorner]
-                view.layer.zPosition = -1
                 prevThreadLinkView = view
                 contentView.addSubview(view)
                 NSLayoutConstraint.activate([
@@ -279,7 +278,6 @@ extension StatusCollectionViewCell {
                 view.backgroundColor = .tintColor.withAlphaComponent(0.5)
                 view.layer.cornerRadius = 2.5
                 view.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
-                view.layer.zPosition = -1
                 nextThreadLinkView = view
                 contentView.addSubview(view)
                 let bottomConstraint = view.bottomAnchor.constraint(equalTo: contentView.bottomAnchor)

Version.xcconfig

@@ -9,8 +9,8 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-MARKETING_VERSION = 2024.3
-CURRENT_PROJECT_VERSION = 127
+MARKETING_VERSION = 2024.2
+CURRENT_PROJECT_VERSION = 122
 CURRENT_PROJECT_VERSION = $(inherited)$(CURRENT_PROJECT_VERSION_BUILD_SUFFIX_$(CONFIGURATION))
 
 CURRENT_PROJECT_VERSION_BUILD_SUFFIX_Debug=-dev