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

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

Browse source
This commit is contained in:
KMY 2024-04-01 08:52:35 +09:00
commit bef755a577
111 changed files with 989 additions and 720 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/javascript/mastodon/features/status/components/action_bar.jsx
View file

@ -83,7 +83,7 @@ class ActionBar extends PureComponent {
static propTypes = {
status: ImmutablePropTypes.map.isRequired,
relationship: ImmutablePropTypes.map,
relationship: ImmutablePropTypes.record,
onReply: PropTypes.func.isRequired,
onReblog: PropTypes.func.isRequired,
onReblogForceModal: PropTypes.func.isRequired,
@ -271,7 +271,10 @@ class ActionBar extends PureComponent {
if (signedIn) {
menu.push(null);
menu.push({ text: intl.formatMessage(status.get('reblogged') ? messages.cancel_reblog : messages.reblog), action: this.handleReblogForceModalClick });
if (status.get('visibility_ex') !== 'limited') {
menu.push({ text: intl.formatMessage(status.get('reblogged') ? messages.cancel_reblog : messages.reblog), action: this.handleReblogForceModalClick });
}
if (publicStatus) {
menu.push({ text: intl.formatMessage(messages.reference), action: this.handleReference });