From 3a8ac75801fdb6c459d1955eab25e870acc8cd4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Mon, 9 Sep 2024 19:11:26 +0200 Subject: [PATCH] pl-fe: treat media with spoiler text as sensitive MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- .../src/components/statuses/sensitive-content-overlay.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/pl-fe/src/components/statuses/sensitive-content-overlay.tsx b/packages/pl-fe/src/components/statuses/sensitive-content-overlay.tsx index a52d1fa7a..36540e580 100644 --- a/packages/pl-fe/src/components/statuses/sensitive-content-overlay.tsx +++ b/packages/pl-fe/src/components/statuses/sensitive-content-overlay.tsx @@ -9,8 +9,8 @@ import { Button, HStack, Text } from '../ui'; import type { Status } from 'pl-fe/normalizers'; -const isMediaVisible = (status: Pick, displayMedia: 'default' | 'show_all' | 'hide_all') => { - let visible = !status.sensitive; +const isMediaVisible = (status: Pick, displayMedia: 'default' | 'show_all' | 'hide_all') => { + let visible = !(status.sensitive || status.spoiler_text); if (status.hidden !== null) visible = !status.hidden; else if (displayMedia === 'show_all') visible = true; @@ -19,7 +19,7 @@ const isMediaVisible = (status: Pick, displayMedia: 'default' | 'show_all' | 'hide_all') => { +const showOverlay = (status: Pick, displayMedia: 'default' | 'show_all' | 'hide_all') => { const visible = isMediaVisible(status, displayMedia); const showHideButton = status.sensitive || (status.media_attachments.length && displayMedia === 'hide_all'); @@ -39,7 +39,7 @@ const messages = defineMessages({ }); interface ISensitiveContentOverlay { - status: Pick; + status: Pick; } const SensitiveContentOverlay = React.forwardRef((props, ref) => {