Packages/InstanceFeatures/Sources/InstanceFeatures/InstanceFeatures.swift

@@ -17,7 +17,7 @@ public class InstanceFeatures: ObservableObject {
     private let _featuresUpdated = PassthroughSubject<Void, Never>()
     public var featuresUpdated: some Publisher<Void, Never> { _featuresUpdated }
     
-    @Published @_spi(InstanceType) public private(set) var instanceType: InstanceType = .mastodon(.vanilla, nil)
+    @Published private var instanceType: InstanceType = .mastodon(.vanilla, nil)
     @Published public private(set) var maxStatusChars = 500
     @Published public private(set) var charsReservedPerURL = 23
     @Published public private(set) var maxPollOptionChars: Int?
@@ -120,11 +120,8 @@ public class InstanceFeatures: ObservableObject {
     
     public func update(instance: Instance, nodeInfo: NodeInfo?) {
         let ver = instance.version.lowercased()
-        // check glitch first b/c it still reports "mastodon" as the software in nodeinfo
         if ver.contains("glitch") {
             instanceType = .mastodon(.glitch, Version(string: ver))
-        } else if nodeInfo?.software.name == "mastodon" {
-            instanceType = .mastodon(.vanilla, Version(string: ver))
         } else if nodeInfo?.software.name == "hometown" {
             var mastoVersion: Version?
             var hometownVersion: Version?
@@ -160,10 +157,6 @@ public class InstanceFeatures: ObservableObject {
             instanceType = .pleroma(.akkoma(akkomaVersion))
         } else if ver.contains("pixelfed") {
             instanceType = .pixelfed
-        } else if nodeInfo?.software.name == "gotosocial" {
-            instanceType = .gotosocial
-        } else if ver.contains("calckey") {
-            instanceType = .calckey(nodeInfo?.software.version)
         } else {
             instanceType = .mastodon(.vanilla, Version(string: ver))
         }
@@ -197,12 +190,10 @@ public class InstanceFeatures: ObservableObject {
 }
 
 extension InstanceFeatures {
-    @_spi(InstanceType) public enum InstanceType {
+    enum InstanceType {
         case mastodon(MastodonType, Version?)
         case pleroma(PleromaType)
         case pixelfed
-        case gotosocial
-        case calckey(String?)
         
         var isMastodon: Bool {
             if case .mastodon(_, _) = self {
@@ -239,7 +230,7 @@ extension InstanceFeatures {
         }
     }
     
-    @_spi(InstanceType) public enum MastodonType {
+    enum MastodonType {
         case vanilla
         case hometown(Version?)
         case glitch
@@ -258,7 +249,7 @@ extension InstanceFeatures {
         }
     }
     
-    @_spi(InstanceType) public enum PleromaType {
+    enum PleromaType {
         case vanilla(Version?)
         case akkoma(Version?)
         
@@ -276,7 +267,7 @@ extension InstanceFeatures {
 }
 
 extension InstanceFeatures {
-    @_spi(InstanceType) public struct Version: Equatable, Comparable, CustomStringConvertible {
+    struct Version: Equatable, Comparable {
         private static let regex = try! NSRegularExpression(pattern: "^(\\d+)\\.(\\d+)\\.(\\d+).*$")
         
         let major: Int
@@ -307,15 +298,11 @@ extension InstanceFeatures {
             self.patch = patch
         }
         
-        public var description: String {
-            "\(major).\(minor).\(patch)"
-        }
-        
-        public static func ==(lhs: Version, rhs: Version) -> Bool {
+        static func ==(lhs: Version, rhs: Version) -> Bool {
             return lhs.major == rhs.major && lhs.minor == rhs.minor && lhs.patch == rhs.patch
         }
         
-        public static func < (lhs: InstanceFeatures.Version, rhs: InstanceFeatures.Version) -> Bool {
+        static func < (lhs: InstanceFeatures.Version, rhs: InstanceFeatures.Version) -> Bool {
             if lhs.major < rhs.major {
                 return true
             } else if lhs.major > rhs.major {

Packages/Pachyderm/Sources/Pachyderm/Client.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import WebURL
 
 /**
  The base Mastodon API client.
@@ -187,9 +186,9 @@ public class Client {
                 
             case let .success(wellKnown, _):
                 if let url = wellKnown.links.first(where: { $0.rel == "http://nodeinfo.diaspora.software/ns/schema/2.0" }),
-                   let href = WebURL(url.href),
-                   href.host == WebURL(self.baseURL)?.host {
-                    let nodeInfo = Request<NodeInfo>(method: .get, path: Endpoint(stringLiteral: href.path))
+                   let components = URLComponents(string: url.href),
+                   components.host == self.baseURL.host {
+                    let nodeInfo = Request<NodeInfo>(method: .get, path: Endpoint(stringLiteral: components.path))
                     self.run(nodeInfo, completion: completion)
                 }
             }
@@ -508,8 +507,6 @@ extension Client {
             // todo: support more status codes
             case .unexpectedStatus(413):
                 return "HTTP 413: Payload Too Large"
-            case .unexpectedStatus(429):
-                return "HTTP 429: Rate Limit Exceeded"
             case .unexpectedStatus(let code):
                 return "HTTP Code \(code)"
             case .invalidRequest:

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

@@ -64,7 +64,7 @@ public final class Status: StatusProtocol, Decodable, Sendable {
         self.reblog = try container.decodeIfPresent(Status.self, forKey: .reblog)
         self.content = try container.decode(String.self, forKey: .content)
         self.createdAt = try container.decode(Date.self, forKey: .createdAt)
-        self.emojis = try container.decodeIfPresent([Emoji].self, forKey: .emojis) ?? []
+        self.emojis = try container.decode([Emoji].self, forKey: .emojis)
         self.reblogsCount = try container.decode(Int.self, forKey: .reblogsCount)
         self.favouritesCount = try container.decode(Int.self, forKey: .favouritesCount)
         self.reblogged = try container.decodeIfPresent(Bool.self, forKey: .reblogged)

Tusker/Preferences/StatusSwipeActions.swift

@@ -114,8 +114,10 @@ private func createBookmarkAction(status: StatusMO, container: StatusSwipeAction
                 let (status, _) = try await container.mastodonController.run(request)
                 container.mastodonController.persistentContainer.addOrUpdate(status: status)
             } catch {
-                let config = ToastConfiguration(from: error, with: "Error \(bookmarked ? "Unb" : "B")ookmarking", in: container.navigationDelegate, retryAction: nil)
-                container.navigationDelegate.showToast(configuration: config, animated: true)
+                if let toastable = container.toastableViewController {
+                    let config = ToastConfiguration(from: error, with: "Error \(bookmarked ? "Unb" : "B")ookmarking", in: toastable, retryAction: nil)
+                    toastable.showToast(configuration: config, animated: true)
+                }
             }
         }
     }

Tusker/Screens/Notifications/FollowRequestNotificationCollectionViewCell.swift

@@ -241,12 +241,12 @@ class FollowRequestNotificationCollectionViewCell: UICollectionViewListCell {
             } catch let error as Client.Error {
                 acceptButton.isEnabled = true
                 rejectButton.isEnabled = true
-                if let delegate = delegate {
-                    let config = ToastConfiguration(from: error, with: "Rejecting Follow", in: delegate) { [weak self] toast in
+                if let toastable = delegate?.toastableViewController {
+                    let config = ToastConfiguration(from: error, with: "Rejecting Follow", in: toastable) { [weak self] toast in
                         toast.dismissToast(animated: true)
                         self?.rejectButtonPressed()
                     }
-                    delegate.showToast(configuration: config, animated: true)
+                    toastable.showToast(configuration: config, animated: true)
                 }
             }
         }
@@ -268,12 +268,12 @@ class FollowRequestNotificationCollectionViewCell: UICollectionViewListCell {
                 acceptButton.isEnabled = true
                 rejectButton.isEnabled = true
                 
-                if let delegate = delegate {
-                    let config = ToastConfiguration(from: error, with: "Accepting Follow", in: delegate) { [weak self] toast in
+                if let toastable = delegate?.toastableViewController {
+                    let config = ToastConfiguration(from: error, with: "Accepting Follow", in: toastable) { [weak self] toast in
                         toast.dismissToast(animated: true)
                         self?.acceptButtonPressed()
                     }
-                    delegate.showToast(configuration: config, animated: true)
+                    toastable.showToast(configuration: config, animated: true)
                 }
             }
         }

Tusker/Screens/Notifications/PollFinishedNotificationCollectionViewCell.swift

@@ -132,7 +132,7 @@ class PollFinishedNotificationCollectionViewCell: UICollectionViewListCell {
         contentLabel.text = try! doc.text()
         
         pollView.mastodonController = mastodonController
-        pollView.delegate = delegate
+        pollView.toastableViewController = delegate
         pollView.updateUI(status: status, poll: poll)
     }
     

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

@@ -193,7 +193,3 @@ extension StatusActionAccountListViewController: ToastableViewController {
         }
     }
 }
-
-extension StatusActionAccountListViewController: TuskerNavigationDelegate {
-    nonisolated var apiController: MastodonController! { mastodonController }
-}

Tusker/Screens/Utilities/EnhancedNavigationViewController.swift

@@ -141,13 +141,11 @@ class EnhancedNavigationViewController: UINavigationController {
                 if self.interactivePushTransition.interactive {
                     // when an interactive push gesture is cancelled, make sure to adding the VC that was being pushed back onto the popped stack so it doesn't disappear
                     self.poppedViewControllers.insert(self.interactivePushTransition.pushingViewController!, at: 0)
-                } else if self.interactivePopGestureRecognizer?.state == .ended {
+                } else {
                     // when an interactive pop gesture is cancelled (i.e. the user lifts their finger before it triggers),
                     // the popViewController(animated:) method has already been called so the VC has already been added to the popped stack
                     // so we make sure to remove it, otherwise there could be duplicate VCs on the navigation stasck
-                    if !self.poppedViewControllers.isEmpty {
-                        self.poppedViewControllers.remove(at: 0)
-                    }
+                    self.poppedViewControllers.remove(at: 0)
                 }
             }
         })

Tusker/Screens/Utilities/Previewing.swift

@@ -409,10 +409,10 @@ extension MenuActionProvider {
     }
     
     private func handleError(_ error: Client.Error, title: String) {
-        if let navigationDelegate {
-            let config = ToastConfiguration(from: error, with: title, in: navigationDelegate, retryAction: nil)
+        if let toastable = self.toastableViewController {
+            let config = ToastConfiguration(from: error, with: title, in: toastable, retryAction: nil)
             DispatchQueue.main.async {
-                navigationDelegate.showToast(configuration: config, animated: true)
+                toastable.showToast(configuration: config, animated: true)
             }
         }
     }

Tusker/Screens/Utilities/TimelineLikeCollectionViewController.swift

@@ -10,7 +10,7 @@ import UIKit
 import Combine
 
 @MainActor
-protocol TimelineLikeCollectionViewController: UIViewController, TimelineLikeControllerDelegate, TuskerNavigationDelegate {
+protocol TimelineLikeCollectionViewController: UIViewController, TimelineLikeControllerDelegate, ToastableViewController {
     associatedtype Section: TimelineLikeCollectionViewSection
     associatedtype Item: TimelineLikeCollectionViewItem where Item.TimelineItem == Self.TimelineItem
     associatedtype Error: TimelineLikeCollectionViewError

Tusker/TuskerNavigationDelegate.swift

@@ -13,7 +13,7 @@ import ComposeUI
 
 @MainActor
 protocol TuskerNavigationDelegate: UIViewController, ToastableViewController {
-    nonisolated var apiController: MastodonController! { get }
+    var apiController: MastodonController! { get }
 }
 
 extension TuskerNavigationDelegate {

Tusker/Views/Poll/StatusPollView.swift

@@ -21,7 +21,7 @@ class StatusPollView: UIView {
     }()
     
     weak var mastodonController: MastodonController!
-    weak var delegate: TuskerNavigationDelegate?
+    weak var toastableViewController: ToastableViewController?
     
     private var statusID: String!
     private(set) var poll: Poll?
@@ -158,9 +158,9 @@ class StatusPollView: UIView {
                 DispatchQueue.main.async {
                     self.updateUI(status: self.mastodonController.persistentContainer.status(for: self.statusID)!, poll: self.poll)
                     
-                    if let delegate = self.delegate {
-                        let config = ToastConfiguration(from: error, with: "Error Voting", in: delegate, retryAction: nil)
-                        delegate.showToast(configuration: config, animated: true)
+                    if let toastable = self.toastableViewController {
+                        let config = ToastConfiguration(from: error, with: "Error Voting", in: toastable, retryAction: nil)
+                        toastable.showToast(configuration: config, animated: true)
                     }
                 }
                 

Tusker/Views/Profile Header/ProfileHeaderView.swift

@@ -392,12 +392,12 @@ class ProfileHeaderView: UIView {
             } catch {
                 followButton.isEnabled = true
                 followButton.configuration!.showsActivityIndicator = false
-                if let delegate = self.delegate {
-                    let config = ToastConfiguration(from: error, with: "Error \(action)", in: delegate) { toast in
+                if let toastable = delegate?.toastableViewController {
+                    let config = ToastConfiguration(from: error, with: "Error \(action)", in: toastable) { toast in
                         toast.dismissToast(animated: true)
                         self.followPressed()
                     }
-                    delegate.showToast(configuration: config, animated: true)
+                    toastable.showToast(configuration: config, animated: true)
                 }
             }
         }

Tusker/Views/Status/StatusCollectionViewCell.swift

@@ -213,7 +213,7 @@ extension StatusCollectionViewCell {
         
         contentContainer.pollView.isHidden = status.poll == nil
         contentContainer.pollView.mastodonController = mastodonController
-        contentContainer.pollView.delegate = delegate
+        contentContainer.pollView.toastableViewController = delegate?.toastableViewController
         contentContainer.pollView.updateUI(status: status, poll: status.poll)
     }
     

Tusker/Views/Toast/ToastConfiguration.swift

@@ -10,7 +10,6 @@ import UIKit
 import Pachyderm
 import Sentry
 import OSLog
-@_spi(InstanceType) import InstanceFeatures
 
 struct ToastConfiguration {
     var systemImageName: String?
@@ -40,7 +39,7 @@ struct ToastConfiguration {
 }
 
 extension ToastConfiguration {
-    init(from error: Error, with title: String, in viewController: TuskerNavigationDelegate, retryAction: ((ToastView) -> Void)?) {
+    init(from error: Error, with title: String, in viewController: UIViewController, retryAction: ((ToastView) -> Void)?) {
         self.init(title: title)
         // localizedDescription is statically dispatched, so we need to call it after the downcast
         if let error = error as? Pachyderm.Client.Error {
@@ -60,7 +59,7 @@ extension ToastConfiguration {
                 viewController.present(reporter, animated: true)
             }
             // TODO: this is a bizarre place to do this, but code path covers basically all errors
-            captureError(error, in: viewController.apiController, title: title)
+            captureError(error, title: title)
         } else {
             self.subtitle = error.localizedDescription
             self.systemImageName = "exclamationmark.triangle"
@@ -71,7 +70,7 @@ extension ToastConfiguration {
         }
     }
     
-    init(from error: Error, with title: String, in viewController: TuskerNavigationDelegate, retryAction: @escaping @MainActor (ToastView) async -> Void) {
+    init(from error: Error, with title: String, in viewController: UIViewController, retryAction: @escaping @MainActor (ToastView) async -> Void) {
         self.init(from: error, with: title, in: viewController) { toast in
             Task {
                 await retryAction(toast)
@@ -85,8 +84,6 @@ fileprivate extension Pachyderm.Client.Error {
         switch type {
         case .networkError(_):
             return "wifi.exclamationmark"
-        case .unexpectedStatus(429):
-            return "clock.badge.exclamationmark"
         default:
             return "exclamationmark.triangle"
         }
@@ -95,7 +92,7 @@ fileprivate extension Pachyderm.Client.Error {
 
 private let toastErrorLogger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "ToastError")
 
-private func captureError(_ error: Client.Error, in mastodonController: MastodonController, title: String) {
+private func captureError(_ error: Client.Error, title: String) {
     let event = Event(error: error)
     event.message = SentryMessage(formatted: "\(title): \(error)")
     event.tags = [
@@ -128,37 +125,6 @@ private func captureError(_ error: Client.Error, in mastodonController: Mastodon
        code == "401" || code == "403" || code == "404" || code == "502" {
         return
     }
-    switch mastodonController.instanceFeatures.instanceType {
-    case .mastodon(let mastodonType, let mastodonVersion):
-        event.tags!["instance_type"] = "mastodon"
-        event.tags!["mastodon_version"] = mastodonVersion?.description ?? "unknown"
-        switch mastodonType {
-        case .vanilla:
-            break
-        case .hometown(_):
-            event.tags!["mastodon_type"] = "hometown"
-        case .glitch:
-            event.tags!["mastodon_type"] = "glitch"
-        }
-    case .pleroma(let pleromaType):
-        event.tags!["instance_type"] = "pleroma"
-        switch pleromaType {
-        case .vanilla(let version):
-            event.tags!["pleroma_version"] = version?.description ?? "unknown"
-        case .akkoma(let version):
-            event.tags!["pleroma_type"] = "akkoma"
-            event.tags!["pleroma_version"] = version?.description ?? "unknown"
-        }
-    case .pixelfed:
-        event.tags!["instance_type"] = "pixelfed"
-    case .gotosocial:
-        event.tags!["instance_type"] = "gotosocial"
-    case .calckey(let calckeyVersion):
-        event.tags!["instance_type"] = "calckey"
-        if let calckeyVersion {
-            event.tags!["calckey_version"] = calckeyVersion
-        }
-    }
     SentrySDK.capture(event: event)
     
     toastErrorLogger.error("\(title, privacy: .public): \(error), \(event.tags!.debugDescription, privacy: .public)")