post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge remote-tracking branch 'parent/main' into kb_migration

Browse source
This commit is contained in:
KMY 2023-08-24 09:58:54 +09:00
commit adfa3524fc
38 changed files with 294 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/mastodon/features/status/components/detailed_status.jsx
View file

@ -372,6 +372,7 @@ class DetailedStatus extends ImmutablePureComponent {
}
const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
const expanded = !status.get('hidden')
return (
<div style={outerStyle}>
@ -397,7 +398,7 @@ class DetailedStatus extends ImmutablePureComponent {
{(!isCardMediaWithSensitive || !status.get('hidden')) && media}
{hashtagBar}
{expanded && hashtagBar}
{emojiReactionsBar}

2
app/javascript/mastodon/features/status/index.jsx
View file

@ -609,7 +609,7 @@ class Status extends ImmutablePureComponent {
onMoveUp={this.handleMoveUp}
onMoveDown={this.handleMoveDown}
contextType='thread'
previousId={i > 0 && list.get(i - 1)}
previousId={i > 0 ? list.get(i - 1) : undefined}
nextId={list.get(i + 1) || (ancestors && statusId)}
rootId={statusId}
/>