fix: use yandex favicon service behind imageProxy

ndom91 · Aug 11, 2024 · d4430be · d4430be
1 parent ec515a3
commit d4430be
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/apps/web/src/lib/components/FilterCombobox.svelte b/apps/web/src/lib/components/FilterCombobox.svelte
@@ -4,6 +4,7 @@
   import { Checkbox } from "$lib/components/ui/checkbox"
   import * as Command from "$lib/components/ui/command"
   import * as Popover from "$lib/components/ui/popover"
+  import { PUBLIC_WORKER_URL } from "$env/static/public"
 
   const {
     data: inputData,
@@ -33,11 +34,11 @@
       variant="outline"
       role="combobox"
       aria-expanded={open}
-      class="justify-between w-[300px]"
+      class="w-[300px] justify-between"
     >
       {placeholder}
       <svg
-        class="ml-2 w-4 h-4 opacity-50 shrink-0"
+        class="ml-2 h-4 w-4 shrink-0 opacity-50"
         data-slot="icon"
         fill="none"
         stroke-width="1.5"
@@ -54,7 +55,7 @@
       </svg>
     </Button>
   </Popover.Trigger>
-  <Popover.Content class="p-0 w-[300px]">
+  <Popover.Content class="w-[300px] p-0">
     <Command.Root>
       <Command.Input placeholder="Search.." />
       <Command.Empty>No results</Command.Empty>
@@ -68,9 +69,9 @@
           >
             <Checkbox id={item.id} bind:checked={item.visible} />
             <img
-              src={`https://favicon.yandex.net/favicon/${new URL(item.url).hostname}`}
+              src={`${PUBLIC_WORKER_URL}/img/_/https://favicon.yandex.net/favicon/${new URL(item.url).hostname}`}
               alt="URL Favicon"
-              class="m-2 rounded-full size-4"
+              class="size-4 m-2 rounded-full"
             />
             <span class="truncate">{item.name}</span>
           </Command.Item>

diff --git a/apps/web/src/lib/components/bookmark-row/BookmarkRow.svelte b/apps/web/src/lib/components/bookmark-row/BookmarkRow.svelte
@@ -87,7 +87,7 @@
     <p class="line-clamp-2 pr-10 md:pr-0">{bookmark.desc}</p>
     <div class="text-muted flex items-center justify-start gap-2 text-sm">
       <img
-        src={`${PUBLIC_WORKER_URL}/img/_/https://favicon.im/${new URL(bookmark.url).hostname}?larger=true`}
+        src={`${PUBLIC_WORKER_URL}/img/_/https://favicon.yandex.net/favicon/${new URL(bookmark.url).hostname}`}
         alt="URL Favicon"
         class="size-4 rounded-full"
       />

diff --git a/apps/web/src/lib/components/feed-row/FeedRow.svelte b/apps/web/src/lib/components/feed-row/FeedRow.svelte
@@ -175,7 +175,7 @@
     <div class="text-muted mt-2 flex items-center justify-start gap-2 text-sm">
       {#if feedEntry.link}
         <img
-          src={`${PUBLIC_WORKER_URL}/img/_/https://favicon.im/${new URL(feedEntry.link).hostname}`}
+          src={`${PUBLIC_WORKER_URL}/img/_/https://favicon.yandex.net/favicon/${new URL(feedEntry.link).hostname}`}
           alt="URL Favicon"
           class="size-4 rounded-full"
         />

diff --git a/apps/web/src/lib/components/home-scroller/BookmarkPreviewCard.svelte b/apps/web/src/lib/components/home-scroller/BookmarkPreviewCard.svelte
@@ -27,7 +27,7 @@
   <div class="flex w-64 flex-col gap-1">
     <div class="flex justify-between">
       <img
-        src={`${PUBLIC_WORKER_URL}/img/_/https://favicon.im/${new URL(item.url).hostname}`}
+        src={`${PUBLIC_WORKER_URL}/img/_/https://favicon.yandex.net/favicon/${new URL(item.url).hostname}`}
         alt="URL Favicon"
         class="size-5 rounded-full"
       />

diff --git a/apps/web/src/lib/components/home-scroller/FeedItemPreviewCard.svelte b/apps/web/src/lib/components/home-scroller/FeedItemPreviewCard.svelte
@@ -74,7 +74,7 @@
   <div class="flex w-64 flex-col gap-1 overflow-hidden">
     <div class="flex justify-between">
       <img
-        src={`${PUBLIC_WORKER_URL}/img/_/https://favicon.im/${new URL(item.link).hostname}`}
+        src={`${PUBLIC_WORKER_URL}/img/_/https://favicon.yandex.net/favicon/${new URL(item.link).hostname}`}
         alt="URL Favicon"
         class="size-5 rounded-full"
       />

diff --git a/apps/web/src/lib/components/metadata-sidebar/BookmarkContent.svelte b/apps/web/src/lib/components/metadata-sidebar/BookmarkContent.svelte
@@ -58,7 +58,7 @@
   const faviconUrl = $derived.by(() => {
     let iconUrl = ""
     try {
-      iconUrl = `${PUBLIC_WORKER_URL}/img/_/https://favicon.im/${new URL($form.url as string).hostname}`
+      iconUrl = `${PUBLIC_WORKER_URL}/img/_/https://favicon.yandex.net/favicon/${new URL($form.url as string).hostname}`
     } catch {
       iconUrl = "https://raw.githubusercontent.com/hustcc/placeholder.js/master/favicon.ico"
     }

diff --git a/apps/web/src/lib/components/metadata-sidebar/FeedContent.svelte b/apps/web/src/lib/components/metadata-sidebar/FeedContent.svelte
@@ -6,6 +6,7 @@
   import type { Feed } from "$lib/types/zod"
   import type { PageServerLoad } from "./$types"
   import { page } from "$app/stores"
+  import { PUBLIC_WORKER_URL } from "$env/static/public"
 
   const ui = useInterface()
 
@@ -44,7 +45,7 @@
           <label for={new URL(feed.url).host} class="flex items-center justify-start gap-2">
             <span> {new URL(feed.url).host} </span>
             <img
-              src={`https://favicon.yandex.net/favicon/${new URL(feed.url).hostname}`}
+              src={`${PUBLIC_WORKER_URL}/img/_/https://favicon.yandex.net/favicon/${new URL(feed.url).hostname}`}
               alt="URL Favicon"
               class="size-6 rounded-full"
             />

diff --git a/apps/web/src/routes/(dashboard)/feeds/FilterBar.svelte b/apps/web/src/routes/(dashboard)/feeds/FilterBar.svelte
@@ -7,6 +7,7 @@
   import * as Popover from "$lib/components/ui/popover"
   import { useInterface } from "$lib/state/ui.svelte"
   import { page } from "$app/stores"
+  import { PUBLIC_WORKER_URL } from "$env/static/public"
 
   const ui = useInterface()
   let open = $state(false)
@@ -68,7 +69,7 @@
               >
                 <span class="mx-2 flex-grow truncate">{feed.name}</span>
                 <img
-                  src={`https://favicon.yandex.net/favicon/${new URL(feed.url).hostname}`}
+                  src={`${PUBLIC_WORKER_URL}/img/_/https://favicon.yandex.net/favicon/${new URL(feed.url).hostname}`}
                   alt="URL Favicon"
                   class="size-5 m-2 rounded-full"
                 />