Mastodon/mastodon-app-ufficiale-iphone-ios
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2025-02-03 10:47:35 +01:00
Code Issues Projects Releases Wiki Activity

Use correct domain to find users

Browse Source
This commit is contained in:
Nathan Mattes 2023-11-04 15:11:42 +01:00
parent 3fc27936d6
commit 77bf1ab03d
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mastodon/Scene/Profile/ProfileViewController.swift
View File

@ -377,11 +377,11 @@ extension ProfileViewController {
profileHeaderViewController.profileHeaderView.viewModel.viewDidAppear profileHeaderViewController.profileHeaderView.viewModel.viewDidAppear
) )
.sink { [weak self] (user, _) in .sink { [weak self] (user, _) in
guard let self = self, let user = user else { return } guard let self, let user else { return }
Task { Task {
_ = try await self.context.apiService.fetchUser( _ = try await self.context.apiService.fetchUser(
username: user.username, username: user.username,
domain: user.domain, domain: user.domainFromAcct,
authenticationBox: self.authContext.mastodonAuthenticationBox authenticationBox: self.authContext.mastodonAuthenticationBox
) )
} }

1
MastodonSDK/Sources/CoreDataStack/Entity/Mastodon/MastodonUser.swift
View File

@ -8,6 +8,7 @@
import CoreData import CoreData
import Foundation import Foundation
/// See also `CoreDataStack.MastodonUser`, this extension contains several
final public class MastodonUser: NSManagedObject { final public class MastodonUser: NSManagedObject {
public typealias ID = String public typealias ID = String

16
MastodonSDK/Sources/MastodonCore/Service/API/APIService+Account.swift
View File

@ -201,8 +201,9 @@ extension APIService {
// user // user
let managedObjectContext = self.backgroundManagedObjectContext let managedObjectContext = self.backgroundManagedObjectContext
var result: MastodonUser?
try await managedObjectContext.performChanges { try await managedObjectContext.performChanges {
_ = Persistence.MastodonUser.createOrMerge( result = Persistence.MastodonUser.createOrMerge(
in: managedObjectContext, in: managedObjectContext,
context: Persistence.MastodonUser.PersistContext( context: Persistence.MastodonUser.PersistContext(
domain: domain, domain: domain,
@ -210,18 +211,9 @@ extension APIService {
cache: nil, cache: nil,
networkDate: response.networkDate networkDate: response.networkDate
) )
) ).user
}
var result: MastodonUser?
try await managedObjectContext.perform {
result = Persistence.MastodonUser.fetch(in: managedObjectContext,
context: Persistence.MastodonUser.PersistContext(
domain: domain,
entity: response.value,
cache: nil,
networkDate: response.networkDate
))
} }
return result return result
} }
} }