From 934f7913f0c4cfce147db10a39f57c08110b2a8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Thu, 5 Feb 2026 23:18:14 +0100 Subject: [PATCH] pl-fe: no duplicated sensitive content button 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/quoted-status.tsx | 14 ++------------ packages/pl-fe/src/components/status-content.tsx | 11 +++++++++-- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/packages/pl-fe/src/components/quoted-status.tsx b/packages/pl-fe/src/components/quoted-status.tsx index 157cd67fa..48a58aec0 100644 --- a/packages/pl-fe/src/components/quoted-status.tsx +++ b/packages/pl-fe/src/components/quoted-status.tsx @@ -3,16 +3,13 @@ import clsx from 'clsx'; import React, { MouseEventHandler } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import StatusMedia from 'pl-fe/components/status-media'; import Stack from 'pl-fe/components/ui/stack'; import AccountContainer from 'pl-fe/containers/account-container'; import EventPreview from './event-preview'; import OutlineBox from './outline-box'; -import QuotedStatusIndicator from './quoted-status-indicator'; import StatusContent from './status-content'; import StatusReplyMentions from './status-reply-mentions'; -import SensitiveContentOverlay from './statuses/sensitive-content-overlay'; import type { SelectedStatus } from 'pl-fe/selectors'; @@ -108,16 +105,9 @@ const QuotedStatus: React.FC = ({ status, onCancel, compose }) => status={status} collapsable isQuote + withMedia + compose={compose} /> - - {status.quote_id && } - - {status.media_attachments.length > 0 && ( -
- - -
- )} )} diff --git a/packages/pl-fe/src/components/status-content.tsx b/packages/pl-fe/src/components/status-content.tsx index e95344621..d7af79e86 100644 --- a/packages/pl-fe/src/components/status-content.tsx +++ b/packages/pl-fe/src/components/status-content.tsx @@ -23,6 +23,7 @@ import OutlineBox from './outline-box'; import { parseContent } from './parsed-content'; import { ParsedMfm } from './parsed-mfm'; import Poll from './polls/poll'; +import QuotedStatusIndicator from './quoted-status-indicator'; import StatusMedia from './status-media'; import SensitiveContentOverlay from './statuses/sensitive-content-overlay'; import TranslateButton from './translate-button'; @@ -72,6 +73,7 @@ interface IStatusContent { isQuote?: boolean; preview?: boolean; withMedia?: boolean; + compose?: boolean; } /** Renders the text content of a status */ @@ -84,6 +86,7 @@ const StatusContent: React.FC = React.memo(({ isQuote = false, preview, withMedia, + compose = false, }) => { const { urlPrivacy, displaySpoilers, renderMfm } = useSettings(); const { greentext } = usePlFeConfig(); @@ -234,7 +237,11 @@ const StatusContent: React.FC = React.memo(({ let quote; if (withMedia && status.quote_id) { - if ((status.quote_visible ?? true) === false) { + if (isQuote) { + quote = ( + + ); + } else if ((status.quote_visible ?? true) === false) { quote = (

@@ -250,7 +257,7 @@ const StatusContent: React.FC = React.memo(({ {((withMedia && status.media_attachments.length > 0) || (status.card && !quote)) && (
- {withMedia && } + {withMedia && }
)}