diff --git a/app/javascript/mastodon/features/compose/components/action_bar.js b/app/javascript/mastodon/features/compose/components/action_bar.js index dd2632796..ff0303bbf 100644 --- a/app/javascript/mastodon/features/compose/components/action_bar.js +++ b/app/javascript/mastodon/features/compose/components/action_bar.js @@ -29,7 +29,7 @@ class ActionBar extends React.PureComponent { handleLogout = () => { this.props.onLogout(); - } + }; render () { const { intl } = this.props; diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js index 95e591e3f..f5048e3c5 100644 --- a/app/javascript/mastodon/features/status/components/action_bar.js +++ b/app/javascript/mastodon/features/status/components/action_bar.js @@ -19,6 +19,7 @@ const messages = defineMessages({ cannot_reblog : { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' }, favourite : { id: 'status.favourite', defaultMessage: 'Favourite' }, bookmark : { id: 'status.bookmark', defaultMessage: 'Bookmark' }, + more : { id: 'status.more', defaultMessage: 'More' }, mute : { id: 'status.mute', defaultMessage: 'Mute @{name}' }, muteConversation : { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' }, unmuteConversation : { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' }, @@ -304,6 +305,8 @@ class ActionBar extends React.PureComponent { if (status.get('visibility') === 'direct') reblogIcon = 'envelope'; else if (status.get('visibility') === 'private') reblogIcon = 'lock'; + let reblog_disabled = (status.get('visibility') === 'direct' || status.get('visibility') === 'private'); + return (