Use authenticated domain for API calls. Modify URL scheme

Mastodon/Scene/Profile/RemoteProfileViewModel.swift

@@ -17,7 +17,6 @@ final class RemoteProfileViewModel: ProfileViewModel {
     init(context: AppContext, authContext: AuthContext, userID: Mastodon.Entity.Account.ID) {
         super.init(context: context, authContext: authContext, optionalMastodonUser: nil)
         
-        Task { @MainActor in
         let domain = authContext.mastodonAuthenticationBox.domain
         let authorization = authContext.mastodonAuthenticationBox.userAuthorization
         Just(userID)
@@ -53,7 +52,6 @@ final class RemoteProfileViewModel: ProfileViewModel {
             }
             .store(in: &disposeBag)
     }
-    }
     
     init(context: AppContext, authContext: AuthContext, notificationID: Mastodon.Entity.Notification.ID) {
         super.init(context: context, authContext: authContext, optionalMastodonUser: nil)

Mastodon/Scene/Thread/ThreadViewModel+LoadThreadState.swift

@@ -77,8 +77,7 @@ extension ThreadViewModel.LoadThreadState {
                 do {
                     let response = try await viewModel.context.apiService.statusContext(
                         statusID: threadContext.statusID,
-                        authenticationBox: viewModel.authContext.mastodonAuthenticationBox,
+                        authenticationBox: viewModel.authContext.mastodonAuthenticationBox
-                        domain: threadContext.domain
                     )
                     
                     await enter(state: NoMore.self)

Mastodon/Supporting Files/SceneDelegate.swift

@@ -245,29 +245,17 @@ extension SceneDelegate {
         print("source application = \(sendingAppID ?? "Unknown")")
         print("url = \(url)")
         
-        if let username = url.user {
+        switch url.host {
-            guard let host = url.host else { return }
+        case "post":
+            showComposeViewController()
+        case "profile":
             let components = url.pathComponents
-            if components.count == 3 && components[1] == "status" {
+            if components.count == 2 && components[0] == "/" {
-                let statusId = components[2]
+                let addr = components[1]
-                // View post from user
+                let tokens = addr.components(separatedBy: "@")
-                print("view status \(statusId)")
+                if tokens.count != 2 { return }
-                if let authContext = coordinator?.authContext {
+                let username = tokens[0]
-                    Task {
+                let host = tokens[1]
-                        guard let thread = try await AppContext.shared.apiService.fetchThread(
-                            statusID: statusId,
-                            domain: host,
-                            authenticationBox: authContext.mastodonAuthenticationBox
-                        ) else { return }
-                        
-                        let threadViewModel = CachedThreadViewModel(context: AppContext.shared,
-                                                                    authContext: authContext,
-                                                                    status: thread)
-                        coordinator?.present(scene: .thread(viewModel: threadViewModel), from: nil, transition: .show)
-                    }
-                }
-            } else {
-                print("view profile \(username)@\(host)")
                 if let authContext = coordinator?.authContext {
                     Task { @MainActor in
                         guard let user = try await AppContext.shared.apiService.fetchUser(
@@ -287,12 +275,28 @@ extension SceneDelegate {
                     }
                 }
             }
-        } else {
+        case "status":
-            guard let action = url.host else { return }
+            let components = url.pathComponents
-            if action == "post" {
+            if components.count == 2 && components[0] == "/" {
-                print("make post")
+                let statusId = components[1]
-                showComposeViewController()
+                // View post from user
+                print("view status \(statusId)")
+                if let authContext = coordinator?.authContext {
+                    Task {
+                        guard let thread = try await AppContext.shared.apiService.fetchThread(
+                            statusID: statusId,
+                            authenticationBox: authContext.mastodonAuthenticationBox
+                        ) else { return }
+                        
+                        let threadViewModel = CachedThreadViewModel(context: AppContext.shared,
+                                                                    authContext: authContext,
+                                                                    status: thread)
+                        coordinator?.present(scene: .thread(viewModel: threadViewModel), from: nil, transition: .show)
                     }
                 }
             }
+        default:
+            return
+        }
+    }
 }

MastodonSDK/Sources/MastodonCore/Service/API/APIService+Thread.swift

@@ -16,10 +16,9 @@ extension APIService {
     
     public func statusContext(
         statusID: Mastodon.Entity.Status.ID,
-        authenticationBox: MastodonAuthenticationBox,
+        authenticationBox: MastodonAuthenticationBox
-        domain: String? = nil
     ) async throws -> Mastodon.Response.Content<Mastodon.Entity.Context> {
-        let domain = domain ?? authenticationBox.domain
+        let domain = authenticationBox.domain
         let authorization = authenticationBox.userAuthorization
         
         let response = try await Mastodon.API.Statuses.statusContext(
@@ -54,9 +53,9 @@ extension APIService {
     
     public func fetchThread(
         statusID: Mastodon.Entity.Status.ID,
-        domain: String,
         authenticationBox: MastodonAuthenticationBox
     ) async throws -> Status? {
+        let domain = authenticationBox.domain
         let authorization = authenticationBox.userAuthorization
         let managedObjectContext = self.backgroundManagedObjectContext