From 6126701025eb5011018e086f21e2a21f7e9d8d90 Mon Sep 17 00:00:00 2001
From: Steven <stevenlgtm@gmail.com>
Date: Fri, 29 Sep 2023 21:34:23 +0800
Subject: [PATCH] chore: update favicon getter

---
 .../extension/src/components/ShortcutView.tsx | 14 +------
 frontend/extension/src/helpers/api.ts         | 14 -------
 frontend/extension/src/helpers/utils.ts       |  9 ++++
 frontend/extension/src/popup.tsx              |  3 +-
 frontend/extension/src/stores/favicon.ts      | 41 -------------------
 5 files changed, 13 insertions(+), 68 deletions(-)
 delete mode 100644 frontend/extension/src/helpers/api.ts
 delete mode 100644 frontend/extension/src/stores/favicon.ts

diff --git a/frontend/extension/src/components/ShortcutView.tsx b/frontend/extension/src/components/ShortcutView.tsx
index 447616f..ac196d0 100644
--- a/frontend/extension/src/components/ShortcutView.tsx
+++ b/frontend/extension/src/components/ShortcutView.tsx
@@ -1,8 +1,7 @@
 import type { Shortcut } from "@/types/proto/api/v2/shortcut_service";
 import { useStorage } from "@plasmohq/storage/hook";
 import classNames from "classnames";
-import { useEffect, useState } from "react";
-import useFaviconStore from "../stores/favicon";
+import { getFaviconWithGoogleS2 } from "@/helpers/utils";
 import Icon from "./Icon";
 
 interface Props {
@@ -11,17 +10,8 @@ interface Props {
 
 const ShortcutView = (props: Props) => {
   const { shortcut } = props;
-  const faviconStore = useFaviconStore();
   const [domain] = useStorage<string>("domain", "");
-  const [favicon, setFavicon] = useState<string | undefined>(undefined);
-
-  useEffect(() => {
-    faviconStore.getOrFetchUrlFavicon(shortcut.link).then((url) => {
-      if (url) {
-        setFavicon(url);
-      }
-    });
-  }, [shortcut.link]);
+  const favicon = getFaviconWithGoogleS2(shortcut.link);
 
   const handleShortcutLinkClick = () => {
     const shortcutLink = `${domain}/s/${shortcut.name}`;
diff --git a/frontend/extension/src/helpers/api.ts b/frontend/extension/src/helpers/api.ts
deleted file mode 100644
index 9b7c7c1..0000000
--- a/frontend/extension/src/helpers/api.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Storage } from "@plasmohq/storage";
-import axios from "axios";
-
-const storage = new Storage();
-
-export const getUrlFavicon = async (url: string) => {
-  const domain = await storage.getItem<string>("domain");
-  const accessToken = await storage.getItem<string>("access_token");
-  return axios.get<string>(`${domain}/api/v1/url/favicon?url=${url}`, {
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-    },
-  });
-};
diff --git a/frontend/extension/src/helpers/utils.ts b/frontend/extension/src/helpers/utils.ts
index fad7257..2280589 100644
--- a/frontend/extension/src/helpers/utils.ts
+++ b/frontend/extension/src/helpers/utils.ts
@@ -3,3 +3,12 @@ import { isNull, isUndefined } from "lodash-es";
 export const isNullorUndefined = (value: any) => {
   return isNull(value) || isUndefined(value);
 };
+
+export const getFaviconWithGoogleS2 = (url: string) => {
+  try {
+    const urlObject = new URL(url);
+    return `https://www.google.com/s2/favicons?sz=128&domain=${urlObject.hostname}`;
+  } catch (error) {
+    return undefined;
+  }
+};
diff --git a/frontend/extension/src/popup.tsx b/frontend/extension/src/popup.tsx
index b55ec0e..85f4cf7 100644
--- a/frontend/extension/src/popup.tsx
+++ b/frontend/extension/src/popup.tsx
@@ -86,7 +86,8 @@ const IndexPopup = () => {
             </>
           ) : (
             <div className="w-full flex flex-col justify-start items-center">
-              <p>No domain and access token found.</p>
+              <Icon.Cookie strokeWidth={1} className="w-20 h-auto mb-4 text-gray-400" />
+              <p>Please set your domain and access token first.</p>
               <div className="w-full flex flex-row justify-center items-center py-4">
                 <Button size="sm" color="primary" onClick={handleSettingButtonClick}>
                   <Icon.Settings className="w-5 h-auto mr-1" /> Setting
diff --git a/frontend/extension/src/stores/favicon.ts b/frontend/extension/src/stores/favicon.ts
deleted file mode 100644
index 2f1ca54..0000000
--- a/frontend/extension/src/stores/favicon.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { create } from "zustand";
-import { persist } from "zustand/middleware";
-import { getUrlFavicon } from "../helpers/api";
-
-interface FaviconState {
-  cache: {
-    [key: string]: string;
-  };
-  getOrFetchUrlFavicon: (url: string) => Promise<string>;
-}
-
-const useFaviconStore = create<FaviconState>()(
-  persist(
-    (set, get) => ({
-      cache: {},
-      getOrFetchUrlFavicon: async (url: string) => {
-        const cache = get().cache;
-        if (cache[url]) {
-          return cache[url];
-        }
-
-        try {
-          const { data: favicon } = await getUrlFavicon(url);
-          if (favicon) {
-            cache[url] = favicon;
-            set(cache);
-            return favicon;
-          }
-        } catch (error) {
-          // do nothing
-        }
-        return "";
-      },
-    }),
-    {
-      name: "favicon_cache",
-    }
-  )
-);
-
-export default useFaviconStore;