From 748dd5e19f8df9ad9d8e4e59cd410945a2e9c09f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Sun, 25 Feb 2024 20:43:34 +0100
Subject: [PATCH] fix(cache): return cached account as promise (#2623)

---
 composables/cache.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/composables/cache.ts b/composables/cache.ts
index 6ea52f6b..094d05e0 100644
--- a/composables/cache.ts
+++ b/composables/cache.ts
@@ -23,7 +23,8 @@ export function fetchStatus(id: string, force = false): Promise<mastodon.v1.Stat
   const key = `${server}:${userId}:status:${id}`
   const cached = cache.get(key)
   if (cached && !force)
-    return cached
+    return Promise.resolve(cached)
+
   const promise = useMastoClient().v1.statuses.$select(id).fetch()
     .then((status) => {
       cacheStatus(status)
@@ -42,7 +43,8 @@ export function fetchAccountById(id?: string | null): Promise<mastodon.v1.Accoun
   const key = `${server}:${userId}:account:${id}`
   const cached = cache.get(key)
   if (cached)
-    return cached
+    return Promise.resolve(cached)
+
   const domain = getInstanceDomainFromServer(server)
   const promise = useMastoClient().v1.accounts.$select(id).fetch()
     .then((r) => {
@@ -64,7 +66,7 @@ export async function fetchAccountByHandle(acct: string): Promise<mastodon.v1.Ac
   const key = `${server}:${userId}:account:${userAcct}`
   const cached = cache.get(key)
   if (cached)
-    return cached
+    return Promise.resolve(cached)
 
   async function lookupAccount() {
     const client = useMastoClient()
@@ -82,13 +84,13 @@ export async function fetchAccountByHandle(acct: string): Promise<mastodon.v1.Ac
     return account
   }
 
-  const account = lookupAccount()
+  const promise = lookupAccount()
     .then((r) => {
       cacheAccount(r, server, true)
       return r
     })
-  cache.set(key, account)
-  return account
+  cache.set(key, promise)
+  return promise
 }
 
 export function useAccountById(id?: string | null) {