Use correct domain to find users

mastodon · Nov 4, 2023 · 77bf1ab · 77bf1ab
1 parent 3fc2793
commit 77bf1ab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/Mastodon/Scene/Profile/ProfileViewController.swift b/Mastodon/Scene/Profile/ProfileViewController.swift
@@ -377,11 +377,11 @@ extension ProfileViewController {
             profileHeaderViewController.profileHeaderView.viewModel.viewDidAppear
         )
         .sink { [weak self] (user, _) in
-            guard let self = self, let user = user else { return }
+            guard let self, let user else { return }
             Task {
                 _ = try await self.context.apiService.fetchUser(
                     username: user.username,
-                    domain: user.domain,
+                    domain: user.domainFromAcct,
                     authenticationBox: self.authContext.mastodonAuthenticationBox
                 )
             }

diff --git a/MastodonSDK/Sources/CoreDataStack/Entity/Mastodon/MastodonUser.swift b/MastodonSDK/Sources/CoreDataStack/Entity/Mastodon/MastodonUser.swift
@@ -8,6 +8,7 @@
 import CoreData
 import Foundation
 
+/// See also `CoreDataStack.MastodonUser`, this extension contains several 
 final public class MastodonUser: NSManagedObject {
 
     public typealias ID = String

diff --git a/MastodonSDK/Sources/MastodonCore/Service/API/APIService+Account.swift b/MastodonSDK/Sources/MastodonCore/Service/API/APIService+Account.swift
@@ -201,27 +201,19 @@ extension APIService {
 
         // user
         let managedObjectContext = self.backgroundManagedObjectContext
+        var result: MastodonUser?
         try await managedObjectContext.performChanges {
-            _ = Persistence.MastodonUser.createOrMerge(
+             result = Persistence.MastodonUser.createOrMerge(
                 in: managedObjectContext,
                 context: Persistence.MastodonUser.PersistContext(
                     domain: domain,
                     entity: response.value,
                     cache: nil,
                     networkDate: response.networkDate
                 )
-            )
-        }
-        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
-                                                    ))
+             ).user
         }
+
         return result
     }
 }