diff --git a/src/renderer/src/components/feed-icon.tsx b/src/renderer/src/components/feed-icon.tsx
index 4c802691c..0550d107b 100644
--- a/src/renderer/src/components/feed-icon.tsx
+++ b/src/renderer/src/components/feed-icon.tsx
@@ -1,7 +1,11 @@
+import { Avatar, AvatarFallback, AvatarImage } from "@radix-ui/react-avatar"
import { SiteIcon } from "@renderer/components/site-icon"
import { Media } from "@renderer/components/ui/media"
+import { getColorScheme, stringToHue } from "@renderer/lib/color"
import { cn } from "@renderer/lib/utils"
import type { CombinedEntryModel, FeedModel } from "@renderer/models"
+import type { ReactNode } from "react"
+import { useMemo } from "react"
export function FeedIcon({
feed,
@@ -9,54 +13,98 @@ export function FeedIcon({
fallbackUrl,
className,
size = 20,
+ fallback = false,
}: {
feed: FeedModel
entry?: CombinedEntryModel["entries"]
fallbackUrl?: string
className?: string
size?: number
+ /**
+ * Image loading error fallback to site icon
+ */
+ fallback?: boolean
}) {
const image = entry?.authorAvatar || feed.image
- if (image) {
- return (
-
- )
- } else if (feed.siteUrl) {
- return (
-
- )
- } else if (fallbackUrl) {
- return (
-
- )
- } else {
+
+ let ImageElement: ReactNode
+
+ switch (true) {
+ case !!image: {
+ ImageElement = (
+
+ )
+ break
+ }
+ case !!fallbackUrl:
+ case !!feed.siteUrl: {
+ ImageElement = (
+
+ )
+ break
+ }
+ }
+
+ const colors = useMemo(
+ () => getColorScheme(stringToHue(feed.title || feed.url), true),
+ [feed.title, feed.url],
+ )
+
+ if (!ImageElement) {
return null
}
+
+ if (fallback && !!image) {
+ return (
+
+
+ {ImageElement}
+
+
+
+ {!!feed.title && feed.title[0]}
+
+
+
+ )
+ }
+
+ return ImageElement
}
diff --git a/src/renderer/src/components/site-icon.tsx b/src/renderer/src/components/site-icon.tsx
index 6f534e41d..d93b45eaa 100644
--- a/src/renderer/src/components/site-icon.tsx
+++ b/src/renderer/src/components/site-icon.tsx
@@ -1,4 +1,6 @@
+import { getColorScheme, stringToHue } from "@renderer/lib/color"
import { cn } from "@renderer/lib/utils"
+import { useEffect, useMemo, useState } from "react"
import { parse } from "tldts"
import { PlatformIcon } from "./ui/platform-icon"
@@ -7,21 +9,38 @@ export function SiteIcon({
url,
className,
style,
+ fallback,
+ fallbackText,
}: {
url?: string
className?: string
style?: React.CSSProperties
+ /**
+ * Fallback image when the site icon is not available
+ */
+ fallback?: boolean
+ fallbackText?: string
}) {
- let host
- let src
- let fallback
+ let host: string
+ let src: string
+ let fallbackUrl = ""
+
+ const colors = useMemo(
+ () => (url && fallback ? getColorScheme(stringToHue(url), true) : null),
+ [fallback, url],
+ )
+
+ const [showFallback, setShowFallback] = useState(false)
+ useEffect(() => {
+ showFallback && fallback && setShowFallback(false)
+ }, [fallback, showFallback, url])
if (!url) return null
try {
host = new URL(url).host
const pureDomain = parse(host).domainWithoutSuffix
- fallback = `https://avatar.vercel.sh/${pureDomain}.svg?text=${pureDomain
+ fallbackUrl = `https://avatar.vercel.sh/${pureDomain}.svg?text=${pureDomain
?.slice(0, 2)
.toUpperCase()}`
src = `https://unavatar.follow.is/${host}?fallback=${fallback}`
@@ -36,21 +55,38 @@ export function SiteIcon({
-
{
- if (fallback && e.currentTarget.src !== fallback) {
- e.currentTarget.src = fallback
- } else {
- // Empty svg
- e.currentTarget.src =
- "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3C/svg%3E"
+ {showFallback && fallback ? (
+
+ >
+ {!!fallbackText && fallbackText[0]}
+
+ ) : (
+
{
+ if (fallbackUrl && e.currentTarget.src !== fallbackUrl) {
+ e.currentTarget.src = fallbackUrl
+ } else if (fallback) {
+ setShowFallback(true)
+ } else {
+ // Empty svg
+ e.currentTarget.src =
+ "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3C/svg%3E"
+ }
+ }}
+ />
+ )}
)
}
diff --git a/src/renderer/src/modules/entry-column/grid-item-template.tsx b/src/renderer/src/modules/entry-column/grid-item-template.tsx
index 5beb441cb..5cdf1cc62 100644
--- a/src/renderer/src/modules/entry-column/grid-item-template.tsx
+++ b/src/renderer/src/modules/entry-column/grid-item-template.tsx
@@ -51,6 +51,7 @@ export function GridItem({
- {!withAudio && }
+ {!withAudio && }
-
+
{user.name?.slice(0, 2)}
diff --git a/src/renderer/src/modules/feed-column/item.tsx b/src/renderer/src/modules/feed-column/item.tsx
index 01affbfcb..7d6c310e5 100644
--- a/src/renderer/src/modules/feed-column/item.tsx
+++ b/src/renderer/src/modules/feed-column/item.tsx
@@ -114,7 +114,7 @@ const FeedItemImpl = ({
feed.errorAt && "text-red-900 dark:text-red-500",
)}
>
-
+