From abbd026c1d753f5831192b4c601b24fb98696f42 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 6 Dec 2022 23:38:00 +0000
Subject: [PATCH] fix: avoid fetching null account id

---
 components/status/StatusReplyingTo.vue | 2 +-
 composables/cache.ts                   | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/status/StatusReplyingTo.vue b/components/status/StatusReplyingTo.vue
index e94cdb2f..39cafbdf 100644
--- a/components/status/StatusReplyingTo.vue
+++ b/components/status/StatusReplyingTo.vue
@@ -5,7 +5,7 @@ const { status } = defineProps<{
   status: Status
 }>()
 
-const account = useAccountById(status.inReplyToAccountId!)
+const account = useAccountById(status.inReplyToAccountId)
 </script>
 
 <template>
diff --git a/composables/cache.ts b/composables/cache.ts
index cab48bda..c496567f 100644
--- a/composables/cache.ts
+++ b/composables/cache.ts
@@ -28,7 +28,10 @@ export function fetchStatus(id: string, force = false): Promise<Status> {
   return promise
 }
 
-export function fetchAccountById(id: string): Promise<Account> {
+export function fetchAccountById(id?: string | null): Promise<Account | null> {
+  if (!id)
+    return Promise.resolve(null)
+
   const key = `account:${id}`
   const cached = cache.get(key)
   if (cached)
@@ -63,7 +66,7 @@ export function useAccountByHandle(acct: string) {
   return useAsyncState(() => fetchAccountByHandle(acct), null).state
 }
 
-export function useAccountById(id: string) {
+export function useAccountById(id?: string | null) {
   return useAsyncState(() => fetchAccountById(id), null).state
 }