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

2025-01-23 18:10:34 +09:00 · 2025-01-23 18:10:34 +09:00 · 50ae2d9439
commit 50ae2d9439
parent 9c14810881 4a9c49ee43
320 changed files with 2587 additions and 2817 deletions
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@ -441,7 +441,7 @@ export function initMediaEditModal(id) {

    dispatch(openModal({
      modalType: 'FOCAL_POINT',
-      modalProps: { id },
+      modalProps: { mediaId: id },
    }));
  };
 }