zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 17 Releases Wiki Activity

Use authenticated domain for API calls. Modify URL scheme

This commit is contained in:
jinsu kim 2023-01-01 15:55:54 -08:00
parent de962a0c09
commit 5c82c04232
4 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mastodon/Scene/Profile/RemoteProfileViewModel.swift
View File

@ -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)

3
Mastodon/Scene/Thread/ThreadViewModel+LoadThreadState.swift
View File

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

58
Mastodon/Supporting Files/SceneDelegate.swift
View File

@ -245,29 +245,17 @@ extension SceneDelegate {
print("source application = \(sendingAppID ?? "Unknown")")
print("url = \(url)")
if let username = url.user {
guard let host = url.host else { return }
switch url.host {
case "post":
showComposeViewController()
case "profile":
let components = url.pathComponents
if components.count == 3 && components[1] == "status" {
let statusId = components[2]
// 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,
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 components.count == 2 && components[0] == "/" {
let addr = components[1]
let tokens = addr.components(separatedBy: "@")
if tokens.count != 2 { return }
let username = tokens[0]
let host = tokens[1]
if let authContext = coordinator?.authContext {
Task { @MainActor in
guard let user = try await AppContext.shared.apiService.fetchUser(
@ -287,12 +275,28 @@ extension SceneDelegate {
}
}
}
} else {
guard let action = url.host else { return }
if action == "post" {
print("make post")
showComposeViewController()
case "status":
let components = url.pathComponents
if components.count == 2 && components[0] == "/" {
let statusId = components[1]
// 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
}
}
}

7
MastodonSDK/Sources/MastodonCore/Service/API/APIService+Thread.swift
View File

@ -16,10 +16,9 @@ extension APIService {
public func statusContext(
statusID: Mastodon.Entity.Status.ID,
authenticationBox: MastodonAuthenticationBox,
domain: String? = nil
authenticationBox: MastodonAuthenticationBox
) 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