From 4605d7fbd8b94db013b0e5058116e421150f2a47 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 9 Oct 2024 12:52:05 -0700
Subject: follows

---
 src/components/Avatar.svelte | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/components/Avatar.svelte')

diff --git a/src/components/Avatar.svelte b/src/components/Avatar.svelte
index 4922c065..e91285da 100644
--- a/src/components/Avatar.svelte
+++ b/src/components/Avatar.svelte
@@ -10,12 +10,13 @@
   $: s = size.toString();
   $: link = user?.anon ? `/${user.pubkey}` : `/${user.username}`;
 
-  $: src =
-    ($avatar?.id && $avatar.id === user.id && $avatar.src) ||
-    "/api/public/" +
-      (user.profile
-        ? user.profile + ".webp"
-        : "punks/" + punk(user.pubkey || user.id || "aa"));
+  let base = "/api/public";
+  $: profile = user?.profile ? `${base}/${user.profile}.webp` : user?.picture;
+  $: fallback = `${base}/punks/` + punk(user.pubkey || user.id || "aa");
+  $: tmp = $avatar?.id && $avatar.id === user.id && $avatar.src;
+  $: src = tmp || profile || fallback;
+
+  let handle = () => (src = fallback);
 </script>
 
 <a href={link} class:pointer-events-none={disabled}>
@@ -26,6 +27,7 @@
       {src}
       class="w-full h-full object-cover object-center overflow-hidden"
       alt={user.username}
+      on:error={handle}
     />
   </div>
 </a>
-- 
cgit v1.2.3