From fcae0df1f8336eab7a63654d225d61d7c93d5534 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 27 Jun 2023 20:21:50 -0500
Subject: [PATCH] Fix instance favicons Fixes
 https://gitlab.com/soapbox-pub/soapbox/-/issues/1447

---
 app/soapbox/components/account.tsx | 8 ++++++--
 app/soapbox/schemas/account.ts     | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/components/account.tsx b/app/soapbox/components/account.tsx
index 56491a7c6..861b8d475 100644
--- a/app/soapbox/components/account.tsx
+++ b/app/soapbox/components/account.tsx
@@ -41,13 +41,17 @@ const InstanceFavicon: React.FC<IInstanceFavicon> = ({ account, disabled }) => {
     }
   };
 
+  if (!account.pleroma?.favicon) {
+    return null;
+  }
+
   return (
     <button
       className='h-4 w-4 flex-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2'
       onClick={handleClick}
       disabled={disabled}
     >
-      <img src={account.favicon} alt='' title={account.domain} className='max-h-full w-full' />
+      <img src={account.pleroma.favicon} alt='' title={account.domain} className='max-h-full w-full' />
     </button>
   );
 };
@@ -229,7 +233,7 @@ const Account = ({
               <HStack alignItems='center' space={1}>
                 <Text theme='muted' size='sm' direction='ltr' truncate>@{username}</Text>
 
-                {account.favicon && (
+                {account.pleroma?.favicon && (
                   <InstanceFavicon account={account} disabled={!withLinkToProfile} />
                 )}
 
diff --git a/app/soapbox/schemas/account.ts b/app/soapbox/schemas/account.ts
index de9763313..563e98e90 100644
--- a/app/soapbox/schemas/account.ts
+++ b/app/soapbox/schemas/account.ts
@@ -30,7 +30,6 @@ const baseAccountSchema = z.object({
   discoverable: z.boolean().catch(false),
   display_name: z.string().catch(''),
   emojis: filteredArray(customEmojiSchema),
-  favicon: z.string().catch(''),
   fields: filteredArray(fieldSchema),
   followers_count: z.number().catch(0),
   following_count: z.number().catch(0),