Merge remote-tracking branch 'parent/main' into upstream-20241101

2024-11-01 08:04:03 +09:00 · 2024-11-01 08:04:03 +09:00 · 1c1f76697b
commit 1c1f76697b
parent 9c71b791e1 b06fd54c30
200 changed files with 1931 additions and 741 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