diff --git a/src/renderer/src/components/feed-icon.tsx b/src/renderer/src/components/feed-icon.tsx index 9de39aa1f..331d968ba 100644 --- a/src/renderer/src/components/feed-icon.tsx +++ b/src/renderer/src/components/feed-icon.tsx @@ -1,6 +1,6 @@ import { Avatar, AvatarFallback, AvatarImage } from "@radix-ui/react-avatar" import { getColorScheme, stringToHue } from "@renderer/lib/color" -import { getProxyUrl } from "@renderer/lib/img-proxy" +import { getImageProxyUrl } from "@renderer/lib/img-proxy" import { cn, getUrlIcon } from "@renderer/lib/utils" import type { CombinedEntryModel, FeedModel } from "@renderer/models" import type { ReactNode } from "react" @@ -23,7 +23,7 @@ const getFeedIconSrc = ({ if (src) { if (proxy) { return [ - getProxyUrl({ + getImageProxyUrl({ url: src, width: proxy.width, height: proxy.height, @@ -123,7 +123,7 @@ export function FeedIcon({ break } case !!image: { - finalSrc = getProxyUrl({ + finalSrc = getImageProxyUrl({ url: image, width: size * 2, height: size * 2, diff --git a/src/renderer/src/components/site-icon.tsx b/src/renderer/src/components/site-icon.tsx index 5b7f4b467..16e96b832 100644 --- a/src/renderer/src/components/site-icon.tsx +++ b/src/renderer/src/components/site-icon.tsx @@ -1,5 +1,5 @@ import { getColorScheme, stringToHue } from "@renderer/lib/color" -import { getProxyUrl } from "@renderer/lib/img-proxy" +import { getImageProxyUrl } from "@renderer/lib/img-proxy" import { cn, getUrlIcon } from "@renderer/lib/utils" import { useEffect, useMemo, useState } from "react" @@ -50,7 +50,7 @@ export function SiteIcon({ if (src) { if (stableProxy) { return [ - getProxyUrl({ + getImageProxyUrl({ url: src, width: stableProxy.width, height: stableProxy.height, diff --git a/src/renderer/src/components/ui/list-item-hover-overlay.tsx b/src/renderer/src/components/ui/list-item-hover-overlay.tsx index 55eedaf33..a0e24908e 100644 --- a/src/renderer/src/components/ui/list-item-hover-overlay.tsx +++ b/src/renderer/src/components/ui/list-item-hover-overlay.tsx @@ -1,6 +1,7 @@ import { m } from "@renderer/components/common/Motion" import { views } from "@renderer/constants" import { useRouteParamsSelector } from "@renderer/hooks/biz/useRouteParams" +import { FeedViewType } from "@renderer/lib/enum" import clsx from "clsx" import { AnimatePresence } from "framer-motion" import { useEffect, useRef, useState } from "react" @@ -39,7 +40,9 @@ export const ListItemHoverOverlay = ({ const mClassName = clsx( "absolute z-[-1]", - "bg-zinc-200/80 dark:bg-neutral-800", + view !== FeedViewType.SocialMedia + ? "bg-zinc-200/80 dark:bg-neutral-800" + : "bg-zinc-100 dark:bg-neutral-800/50", views[view].wideMode ? "inset-x-0 inset-y-1 rounded-xl" : "-inset-x-2 inset-y-0", className, ) diff --git a/src/renderer/src/components/ui/media.tsx b/src/renderer/src/components/ui/media.tsx index 1578573c1..e7473445a 100644 --- a/src/renderer/src/components/ui/media.tsx +++ b/src/renderer/src/components/ui/media.tsx @@ -1,5 +1,5 @@ import { nextFrame } from "@renderer/lib/dom" -import { getProxyUrl } from "@renderer/lib/img-proxy" +import { getImageProxyUrl } from "@renderer/lib/img-proxy" import { cn } from "@renderer/lib/utils" import { saveImageDimensionsToDb } from "@renderer/store/image/db" import { useForceUpdate } from "framer-motion" @@ -50,7 +50,7 @@ const MediaImpl: FC = ({ const [hidden, setHidden] = useState(!src) const [imgSrc, setImgSrc] = useState(() => proxy && src && !failedList.has(src) - ? getProxyUrl({ + ? getImageProxyUrl({ url: src, width: proxy.width, height: proxy.height, @@ -160,6 +160,7 @@ const MediaImpl: FC = ({ } return (