fix favicons in chrome

Author: mathio

chrome/src/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "New Tab Page Bookmarks",
   "description": "Displays your bookmarks in multiple columns for quick access from the new tab page",
-  "version": "1.10",
+  "version": "1.11",
   "manifest_version": 3,
   "author": "https://github.com/mathio",
   "chrome_url_overrides": {

firefox/src/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "New Tab Page Bookmarks",
   "description": "Displays your bookmarks in multiple columns for quick access from the new tab page",
-  "version": "1.10",
+  "version": "1.11",
   "manifest_version": 2,
   "author": "https://github.com/mathio",
   "chrome_url_overrides": {

src/index.js

@@ -1,20 +1,23 @@
 import { decodeBlurHash } from './fast-blurhash.js'
 
-const isFirefox = typeof browser !== 'undefined'
+const getChromeIconUrl = (pageUrl) => {
+  try {
+    const url = new URL(chrome.runtime.getURL('/_favicon/'))
+    url.searchParams.set('pageUrl', pageUrl)
+    url.searchParams.set('size', '32')
+    return url.toString()
+  } catch {
+    return null
+  }
+}
 
-export const DEFAULT_ICON_SVG = `data:image/svg+xml,${encodeURIComponent(
-  '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="gray" viewBox="0 0 16 16"><path d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8m7.5-6.923c-.67.204-1.335.82-1.887 1.855A8 8 0 0 0 5.145 4H7.5zM4.09 4a9.3 9.3 0 0 1 .64-1.539 7 7 0 0 1 .597-.933A7.03 7.03 0 0 0 2.255 4zm-.582 3.5c.03-.877.138-1.718.312-2.5H1.674a7 7 0 0 0-.656 2.5zM4.847 5a12.5 12.5 0 0 0-.338 2.5H7.5V5zM8.5 5v2.5h2.99a12.5 12.5 0 0 0-.337-2.5zM4.51 8.5a12.5 12.5 0 0 0 .337 2.5H7.5V8.5zm3.99 0V11h2.653c.187-.765.306-1.608.338-2.5zM5.145 12q.208.58.468 1.068c.552 1.035 1.218 1.65 1.887 1.855V12zm.182 2.472a7 7 0 0 1-.597-.933A9.3 9.3 0 0 1 4.09 12H2.255a7 7 0 0 0 3.072 2.472M3.82 11a13.7 13.7 0 0 1-.312-2.5h-2.49c.062.89.291 1.733.656 2.5zm6.853 3.472A7 7 0 0 0 13.745 12H11.91a9.3 9.3 0 0 1-.64 1.539 7 7 0 0 1-.597.933M8.5 12v2.923c.67-.204 1.335-.82 1.887-1.855q.26-.487.468-1.068zm3.68-1h2.146c.365-.767.594-1.61.656-2.5h-2.49a13.7 13.7 0 0 1-.312 2.5m2.802-3.5a7 7 0 0 0-.656-2.5H12.18c.174.782.282 1.623.312 2.5zM11.27 2.461c.247.464.462.98.64 1.539h1.835a7 7 0 0 0-3.072-2.472c.218.284.418.598.597.933M10.855 4a8 8 0 0 0-.468-1.068C9.835 1.897 9.17 1.282 8.5 1.077V4z"/></svg>'
-)}`
+const getFallbackIconUrl = (pageUrl) => {
+  const { hostname } = new URL(pageUrl)
+  return `https://icons.duckduckgo.com/ip3/${hostname}.ico`
+}
 
-const getFavicon = (pageUrl) => {
-  if (isFirefox) {
-    const { hostname } = new URL(pageUrl)
-    return `https://icons.duckduckgo.com/ip3/${hostname}.ico`
-  }
-  const url = new URL(chrome.runtime.getURL('/_favicon/'))
-  url.searchParams.set('pageUrl', pageUrl)
-  url.searchParams.set('size', '32')
-  return url.toString()
+const getFaviconUrl = (pageUrl) => {
+  return getChromeIconUrl(pageUrl) || getFallbackIconUrl(pageUrl)
 }
 
 const addElm = (parent, tag, text, attributes) => {
@@ -58,9 +61,12 @@ const renderNode =
 
       li.append(link)
 
-      icon.src = getFavicon(href)
+      icon.src = getFaviconUrl(href)
       icon.onerror = () => {
-        icon.src = DEFAULT_ICON_SVG
+        const fallbackUrl = getFallbackIconUrl(href)
+        if (icon.src !== fallbackUrl) {
+          icon.src = fallbackUrl
+        }
       }
     }
   }