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

2025-03-10 19:58:05 +09:00 · 2025-03-10 19:58:05 +09:00 · 5979c0ea1d
commit 5979c0ea1d
parent 69d5383d1f 207029eb2f
345 changed files with 4304 additions and 2540 deletions
--- a/app/javascript/mastodon/features/status/components/detailed_status.tsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.tsx
@ -237,7 +237,7 @@ export const DetailedStatus: React.FC<{
      <Card
        sensitive={status.get('sensitive') && !status.get('spoiler_text')}
        onOpenMedia={onOpenMedia}
-        card={status.get('card', null)}
+        card={status.get('card')}
      />
    );
  }