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

UI update should be invoked on the main thread

This commit is contained in:
jinsu kim 2023-01-01 01:00:00 -08:00
parent bb1c003228
commit f71c4964f5
2 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,38 +17,42 @@ final class RemoteProfileViewModel: ProfileViewModel {
init(context: AppContext, authContext: AuthContext, userID: Mastodon.Entity.Account.ID) {
super.init(context: context, authContext: authContext, optionalMastodonUser: nil)
let domain = authContext.mastodonAuthenticationBox.domain
let authorization = authContext.mastodonAuthenticationBox.userAuthorization
Just(userID)
.asyncMap { userID in
try await context.apiService.accountInfo(
domain: domain,
userID: userID,
authorization: authorization
)
}
.retry(3)
.sink { completion in
switch completion {
case .failure(let error):
// TODO: handle error
os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: remote user %s fetch failed: %s", ((#file as NSString).lastPathComponent), #line, #function, userID, error.localizedDescription)
case .finished:
os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: remote user %s fetched", ((#file as NSString).lastPathComponent), #line, #function, userID)
Task { @MainActor in
let domain = authContext.mastodonAuthenticationBox.domain
let authorization = authContext.mastodonAuthenticationBox.userAuthorization
Just(userID)
.asyncMap { userID in
try await context.apiService.accountInfo(
domain: domain,
userID: userID,
authorization: authorization
)
}
} receiveValue: { [weak self] response in
guard let self = self else { return }
let managedObjectContext = context.managedObjectContext
let request = MastodonUser.sortedFetchRequest
request.fetchLimit = 1
request.predicate = MastodonUser.predicate(domain: domain, id: response.value.id)
guard let mastodonUser = managedObjectContext.safeFetch(request).first else {
assertionFailure()
return
.retry(3)
.sink { completion in
switch completion {
case .failure(let error):
// TODO: handle error
os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: remote user %s fetch failed: %s", ((#file as NSString).lastPathComponent), #line, #function, userID, error.localizedDescription)
case .finished:
os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: remote user %s fetched", ((#file as NSString).lastPathComponent), #line, #function, userID)
}
} receiveValue: { [weak self] response in
guard let self = self else { return }
let managedObjectContext = context.managedObjectContext
let request = MastodonUser.sortedFetchRequest
request.fetchLimit = 1
request.predicate = MastodonUser.predicate(domain: domain, id: response.value.id)
guard let mastodonUser = managedObjectContext.safeFetch(request).first else {
assertionFailure()
return
}
DispatchQueue.main.async {
self.user = mastodonUser
}
}
self.user = mastodonUser
}
.store(in: &disposeBag)
.store(in: &disposeBag)
}
}
init(context: AppContext, authContext: AuthContext, notificationID: Mastodon.Entity.Notification.ID) {

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

@ -73,11 +73,12 @@ extension ThreadViewModel.LoadThreadState {
return
}
Task {
Task { @MainActor in
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)