Merge commit '8099ba04be' into kb_migration

2023-04-25 17:08:32 +09:00 · 2023-04-25 17:08:32 +09:00 · 70ea37a4cc
commit 70ea37a4cc
parent 91adb3047f 8099ba04be
302 changed files with 4018 additions and 2611 deletions
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@ -69,6 +69,7 @@ const makeMapStateToProps = () => {

  const mapStateToProps = (state, props) => ({
    status: getStatus(state, props),
+    nextInReplyToId: props.nextId ? state.getIn(['statuses', props.nextId, 'in_reply_to_id']) : null,
    pictureInPicture: getPictureInPicture(state, props),
  });