Merge pull request #585 from mastodon/fix-authenticated-user-profile-reload

Fix authenticated user account not reloaded

Mastodon/Scene/Profile/ProfileViewController.swift

@@ -552,6 +552,9 @@ extension ProfileViewController {
             userTimelineViewController.viewModel.stateMachine.enter(UserTimelineViewModel.State.Reloading.self)
         }
 
+        // trigger authenticated user account update
+        viewModel.context.instanceService.updateActiveUserAccountPublisher.send()
+
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
             sender.endRefreshing()
         }

Mastodon/Scene/Root/MainTab/MainTabBarController.swift

@@ -313,6 +313,11 @@ extension MainTabBarController {
             let currentUserDisplayName = user.displayNameWithFallback ?? "no user"
             profileTabItem.accessibilityHint = L10n.Scene.AccountList.tabBarHint(currentUserDisplayName)
 
+            context.instanceService.updateActiveUserAccountPublisher
+                .sink { [weak self] in
+                    self?.updateUserAccount()
+                }
+                .store(in: &disposeBag)
         } else {
             self.avatarURLObserver = nil
         }
@@ -487,6 +492,26 @@ extension MainTabBarController {
         avatarButton.setNeedsLayout()
     }
     
+    private func updateUserAccount() {
+        guard let authContext = authContext else { return }
+        
+        Task { @MainActor in
+            let profileResponse = try await context.apiService.authenticatedUserInfo(
+                authenticationBox: authContext.mastodonAuthenticationBox
+            )
+            
+            if let user = authContext.mastodonAuthenticationBox.authenticationRecord.object(
+                in: context.managedObjectContext
+            )?.user {
+                user.update(
+                    property: .init(
+                        entity: profileResponse.value,
+                        domain: authContext.mastodonAuthenticationBox.domain
+                    )
+                )
+            }
+        }
+    }
 }
 
 extension MainTabBarController {

Mastodon/Supporting Files/SceneDelegate.swift

@@ -110,6 +110,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         // trigger status filter update
         AppContext.shared.statusFilterService.filterUpdatePublisher.send()
         
+        // trigger authenticated user account update
+        AppContext.shared.instanceService.updateActiveUserAccountPublisher.send()
+
         if let shortcutItem = savedShortCutItem {
             Task {
                 _ = await handler(shortcutItem: shortcutItem)

MastodonSDK/Sources/MastodonCore/Extension/CoreDataStack/MastodonUser+Property.swift

@@ -10,6 +10,10 @@ import CoreDataStack
 import MastodonSDK
 
 extension MastodonUser.Property {
+    public init(entity: Mastodon.Entity.Account, domain: String) {
+        self.init(entity: entity, domain: domain, networkDate: Date())
+    }
+    
     init(entity: Mastodon.Entity.Account, domain: String, networkDate: Date) {
         self.init(
             identifier: entity.id + "@" + domain,

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

@@ -13,6 +13,15 @@ import MastodonCommon
 import MastodonSDK
 
 extension APIService {
+    public func authenticatedUserInfo(
+        authenticationBox: MastodonAuthenticationBox
+    ) async throws -> Mastodon.Response.Content<Mastodon.Entity.Account> {
+        try await accountInfo(
+            domain: authenticationBox.domain,
+            userID: authenticationBox.userID,
+            authorization: authenticationBox.userAuthorization
+        )
+    }
 
     public func accountInfo(
         domain: String,

MastodonSDK/Sources/MastodonCore/Service/InstanceService.swift

@@ -24,6 +24,7 @@ public final class InstanceService {
     weak var authenticationService: AuthenticationService?
     
     // output
+    public let updateActiveUserAccountPublisher = PassthroughSubject<Void, Never>()
 
     init(
         apiService: APIService,