Merge commit '13ab4b54e2' into upstream-20241204-15

2024-12-04 08:37:37 +09:00 · 2024-12-04 08:37:37 +09:00 · a6a237bc8e
commit a6a237bc8e
parent fb90e19940 13ab4b54e2
228 changed files with 2678 additions and 1266 deletions
--- a/app/javascript/mastodon/features/status/components/detailed_status.tsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.tsx
@ -163,7 +163,7 @@ export const DetailedStatus: React.FC<{
    media = <PictureInPicturePlaceholder aspectRatio={attachmentAspectRatio} />;
  } else if (status.get('media_attachments').size > 0) {
    if (
-      ['image', 'gifv'].includes(
+      ['image', 'gifv', 'unknown'].includes(
        status.getIn(['media_attachments', 0, 'type']) as string,
      ) ||
      status.get('media_attachments').size > 1