From a77ee6b7afebecb6005ffe2d538aec94a02afad5 Mon Sep 17 00:00:00 2001
From: Thomas Ricouard <ricouard77@gmail.com>
Date: Tue, 10 Jan 2023 21:09:20 +0100
Subject: [PATCH] Make loading account data faster

---
 .../Account/AccountDetailViewModel.swift      | 48 +++++++++++++------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/Packages/Account/Sources/Account/AccountDetailViewModel.swift b/Packages/Account/Sources/Account/AccountDetailViewModel.swift
index 32c30eb4..61b01b7f 100644
--- a/Packages/Account/Sources/Account/AccountDetailViewModel.swift
+++ b/Packages/Account/Sources/Account/AccountDetailViewModel.swift
@@ -100,23 +100,26 @@ class AccountDetailViewModel: ObservableObject, StatusesFetcher {
     self.accountState = .data(account: account)
   }
   
+  struct AccountData {
+    let account: Account
+    let featuredTags: [FeaturedTag]
+    let relationships: [Relationshionship]
+    let familliarFollowers: [FamilliarAccounts]
+  }
+  
   func fetchAccount() async {
     guard let client else { return }
     do {
-      async let account: Account = client.get(endpoint: Accounts.accounts(id: accountId))
-      async let featuredTags: [FeaturedTag] = client.get(endpoint: Accounts.featuredTags(id: accountId))
-      let loadedAccount = try await account
-      self.account = loadedAccount
-      self.featuredTags = try await featuredTags
-      self.featuredTags.sort { $0.statusesCountInt > $1.statusesCountInt }
-      self.fields = loadedAccount.fields
-      if client.isAuth {
-        async let relationships: [Relationshionship] = client.get(endpoint: Accounts.relationships(ids: [accountId]))
-        async let familliarFollowers: [FamilliarAccounts] = client.get(endpoint: Accounts.familiarFollowers(withAccount: accountId))
-        self.relationship = try await relationships.first
-        self.familliarFollowers = try await familliarFollowers.first?.accounts ?? []
-      }
-      accountState = .data(account: loadedAccount)
+      let data = try await fetchAccountData(accountId: accountId, client: client)
+      accountState = .data(account: data.account)
+  
+      account = data.account
+      fields = data.account.fields
+      featuredTags = data.featuredTags
+      featuredTags.sort { $0.statusesCountInt > $1.statusesCountInt }
+      relationship = data.relationships.first
+      familliarFollowers = data.familliarFollowers.first?.accounts ?? []
+      
     } catch {
       if let account {
         accountState = .data(account: account)
@@ -126,6 +129,23 @@ class AccountDetailViewModel: ObservableObject, StatusesFetcher {
     }
   }
   
+  func fetchAccountData(accountId: String, client: Client) async throws -> AccountData {
+    async let account: Account = client.get(endpoint: Accounts.accounts(id: accountId))
+    async let featuredTags: [FeaturedTag] = client.get(endpoint: Accounts.featuredTags(id: accountId))
+    if client.isAuth && !isCurrentUser {
+      async let relationships: [Relationshionship] = client.get(endpoint: Accounts.relationships(ids: [accountId]))
+      async let familliarFollowers: [FamilliarAccounts] = client.get(endpoint: Accounts.familiarFollowers(withAccount: accountId))
+      return try await .init(account: account,
+                             featuredTags: featuredTags,
+                             relationships: relationships,
+                             familliarFollowers: familliarFollowers)
+    }
+    return try await .init(account: account,
+                           featuredTags: featuredTags,
+                           relationships: [],
+                           familliarFollowers: [])
+  }
+  
   func fetchStatuses() async {
     guard let client else { return }
     do {