From 4a4ecee7f199ea292a6da7293388ef249e91c766 Mon Sep 17 00:00:00 2001
From: DIYgod <i@diygod.me>
Date: Tue, 10 Dec 2024 12:36:24 +0800
Subject: [PATCH] feat: move replaceImgUrlIfNeed

---
 apps/server/client/components/ui/feed-certification.tsx    | 3 +--
 apps/server/client/pages/(main)/share/users/[id]/index.tsx | 6 +-----
 packages/components/src/ui/avatar/index.tsx                | 2 ++
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/server/client/components/ui/feed-certification.tsx b/apps/server/client/components/ui/feed-certification.tsx
index 4cdae3067..04ccf8801 100644
--- a/apps/server/client/components/ui/feed-certification.tsx
+++ b/apps/server/client/components/ui/feed-certification.tsx
@@ -7,7 +7,6 @@ import {
   TooltipTrigger,
 } from "@follow/components/ui/tooltip/index.jsx"
 import type { FeedOrListRespModel } from "@follow/models/types"
-import { replaceImgUrlIfNeed } from "@follow/utils/img-proxy"
 import { cn } from "@follow/utils/utils"
 import { useTranslation } from "react-i18next"
 
@@ -60,7 +59,7 @@ export const FeedCertification = ({
               <span>{t("feed_item.claimed_by_owner")}</span>
               {feed.owner ? (
                 <Avatar className="inline-flex aspect-square size-5 rounded-full">
-                  <AvatarImage src={replaceImgUrlIfNeed(feed.owner.image || undefined)} />
+                  <AvatarImage src={feed.owner.image || undefined} />
                   <AvatarFallback>{feed.owner.name?.slice(0, 2)}</AvatarFallback>
                 </Avatar>
               ) : (
diff --git a/apps/server/client/pages/(main)/share/users/[id]/index.tsx b/apps/server/client/pages/(main)/share/users/[id]/index.tsx
index 4496e93a6..042b9df75 100644
--- a/apps/server/client/pages/(main)/share/users/[id]/index.tsx
+++ b/apps/server/client/pages/(main)/share/users/[id]/index.tsx
@@ -8,7 +8,6 @@ import { Button } from "@follow/components/ui/button/index.jsx"
 import { FeedIcon } from "@follow/components/ui/feed-icon/index.jsx"
 import { LoadingCircle } from "@follow/components/ui/loading/index.jsx"
 import { useTitle } from "@follow/hooks"
-import { replaceImgUrlIfNeed } from "@follow/utils/img-proxy"
 import { UrlBuilder } from "@follow/utils/url-builder"
 import { cn } from "@follow/utils/utils"
 import { Fragment } from "react"
@@ -35,10 +34,7 @@ export const Component = () => {
       ) : (
         <Fragment>
           <Avatar className="aspect-square size-16">
-            <AvatarImage
-              className="duration-200 animate-in fade-in-0"
-              src={replaceImgUrlIfNeed(user.data?.image || undefined)}
-            />
+            <AvatarImage className="duration-200 animate-in fade-in-0" src={user.data?.image} />
             <AvatarFallback>{user.data?.name?.slice(0, 2)}</AvatarFallback>
           </Avatar>
           <div className="mb-8 flex flex-col items-center">
diff --git a/packages/components/src/ui/avatar/index.tsx b/packages/components/src/ui/avatar/index.tsx
index 2e7e7abcd..8e1360130 100644
--- a/packages/components/src/ui/avatar/index.tsx
+++ b/packages/components/src/ui/avatar/index.tsx
@@ -1,3 +1,4 @@
+import { replaceImgUrlIfNeed } from "@follow/utils/img-proxy"
 import { cn } from "@follow/utils/utils"
 import * as AvatarPrimitive from "@radix-ui/react-avatar"
 import * as React from "react"
@@ -21,6 +22,7 @@ export const AvatarImage = React.forwardRef<
   <AvatarPrimitive.Image
     ref={ref}
     className={cn("aspect-square size-full", className)}
+    src={replaceImgUrlIfNeed(props.src)}
     {...props}
   />
 ))