From b969261cbd90bbf9f1eac8b554ad338dc38489eb Mon Sep 17 00:00:00 2001 From: Tristan Yang Date: Fri, 2 Jun 2023 20:20:17 +0800 Subject: [PATCH] fix: url preview without favicon --- src/assets/icons/www.png | Bin 0 -> 1887 bytes src/components/Message/URLPreview.tsx | 12 ++---------- 2 files changed, 2 insertions(+), 10 deletions(-) create mode 100644 src/assets/icons/www.png diff --git a/src/assets/icons/www.png b/src/assets/icons/www.png new file mode 100644 index 0000000000000000000000000000000000000000..1de0357183197207a5297414a012e46a85b792fd GIT binary patch literal 1887 zcmV-l2cY#!%zT|ME*1Xv9g0S7g-Sm^Z;%J}LVVcohn9!ib=f&Ukw$$&h(Cv`A z;)Jr^qsQopwcyq2`>f6Ex7F~n^Y@$p0010xQchCZ1 z9-R+2i-3A%i&o93mCE!cq=*#8#?#?!7-+!Ja@Jte?Kfiwr z?OXCQNL;T4r{8xl_FRyBPJVkgT3wDRSra;lPcpV_Ch`mP)(7}1VzD8!Ce4Y2%#4-(b`oUUaVa& zC-AhNHQZW)vAE>eSI`Y1^l%dfyg?)MtBdk7Tk(I_&K|awy?-Z&?Ik?LvtT7R zDC{hC-n}eo)I-1Sf(R^d7TP0m_nHUhX0jqd70o2JjBN1*FKXhTB zoHVsldH7QH0|IIjZ0%GZ&<=C}TjM{GaqYlFJ2f>0;tPhefmGLEE$h{8qLx z@k6U1O1h|FM#fvpKuVHv(Zm-5JjAt8>MCPBU+GarpsV`^WK=-gRp4GlU|@38P{!p# z&0=W6UpIT@7`9QWC>M)!;6VZX(PbW<^0d+gYJxs|d7!kG;N^jl(iu^yz%cQEgxg5+)bk+dSsjc*=1JBj!{w=jt{!vf{UlBN=OURmZxIo*kCgz&4#WSqAi7YA0NppSu|5i9~|@$f8YQ2>XBE8M4?bNON=6Z8du`=D+D3o{&4 z;wBrPnqs2M7Z+GtL?AX2JA4F8qX2xu>GF`uM0-emhZD^)8jJj(XGx+QNh=b4vlM+h z#}Y#X5{teiUf;BrH#O~3@{whYU6Cuh`3AG!D(UTwOXwKrVNvTLqp zeY%>hxjfpeSbO2}Xh~_UPS8$cfBp4#Z1EJ|bG@}Zy56qJx5Ll{e0|gkD6d|?8+-v@ zM-h}srzz2Y2Ssokdk=|Ge}Tj(84{y`#O_9##j~~gd^625Skf%VyRQ*JedUmgyG=w; z0d8|M5yWzF0-2*sBfmmbl|oci-cVH+uaap$;zXu(A@eI_niD3|nqwx@UZ?wz3DJG? z=X76}=)Mea$ou0Bla%u?A!*ZwaB`%kkLI&SPn4=U*2eB*v5Li1B1>YwG@3!NwEEn!5kr Z literal 0 HcmV?d00001 diff --git a/src/components/Message/URLPreview.tsx b/src/components/Message/URLPreview.tsx index 2f4dbe0d..246b60d4 100644 --- a/src/components/Message/URLPreview.tsx +++ b/src/components/Message/URLPreview.tsx @@ -4,6 +4,7 @@ import { useDispatch } from "react-redux"; import { useLazyGetOGInfoQuery } from "@/app/services/message"; import { upsertOG } from "@/app/slices/footprint"; import { useAppSelector } from "@/app/store"; +import defaultFav from "@/assets/icons/www.png"; export default function URLPreview({ url = "" }) { const dispatch = useDispatch(); @@ -15,16 +16,10 @@ export default function URLPreview({ url = "" }) { ); useEffect(() => { if (ogData) { - let defaultFavIcon = ""; - try { - defaultFavIcon = `${new URL(url).origin}/favicon.ico`; - } catch { - defaultFavIcon = `${location.origin}/favicon.ico`; - } const title = ogData?.title || ogData?.site_name || ""; const description = ogData?.description || ""; const ogImage = ogData?.images.find((i) => !!i.url)?.url || ""; - const favicon = ogData?.favicon_url || defaultFavIcon; + const favicon = ogData?.favicon_url || defaultFav; setFavicon(favicon); setData({ title, description, ogImage }); } else if (url) { @@ -32,9 +27,6 @@ export default function URLPreview({ url = "" }) { getInfo(url); } }, [url, ogData]); - // const handleFavError = () => { - // setFavicon(""); - // }; const handleOGImageError = () => { dispatch(upsertOG({ key: url, value: { ...ogData, images: [] } })); };