From e2dfdfb4a545f140cf50ac4b45d69257e66adc28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicole=20Miko=C5=82ajczyk?= Date: Thu, 24 Apr 2025 22:11:16 +0200 Subject: [PATCH] pl-fe: disableUserProvidedMedia: do not display description when it's the default one MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nicole Mikołajczyk --- packages/pl-fe/src/components/ui/avatar.tsx | 3 ++- packages/pl-fe/src/features/account/components/header.tsx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/pl-fe/src/components/ui/avatar.tsx b/packages/pl-fe/src/components/ui/avatar.tsx index 859f422c2..21b164ef4 100644 --- a/packages/pl-fe/src/components/ui/avatar.tsx +++ b/packages/pl-fe/src/components/ui/avatar.tsx @@ -5,6 +5,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import StillImage, { IStillImage } from 'pl-fe/components/still-image'; import { useSettings } from 'pl-fe/hooks/use-settings'; +import { isDefaultAvatar } from 'pl-fe/utils/accounts'; import AltIndicator from '../alt-indicator'; @@ -66,7 +67,7 @@ const Avatar = (props: IAvatar) => { }), [size, color]); if (disableUserProvidedMedia) { - if (isAvatarMissing || !alt) return null; + if (isAvatarMissing || !alt || isDefaultAvatar(src)) return null; return ( = ({ account }) => { let header: React.ReactNode; if (settings.disableUserProvidedMedia) { - if (!account.header_description) return null; + if (!account.header_description || isDefaultHeader(account.header)) return null; else return (