Merge commit '71db616fed' into kb_migration

2023-07-14 12:43:55 +09:00 · 2023-07-14 12:43:55 +09:00 · f18fa97f0c
commit f18fa97f0c
parent 7b735921dc 71db616fed
607 changed files with 3491 additions and 2677 deletions
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@ -154,7 +154,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
    dispatch(openModal({
      modalType: 'EMBED',
      modalProps: {
-        url: status.get('url'),
+        id: status.get('id'),
        onError: error => dispatch(showAlertForError(error)),
      },
    }));