diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-01-17 10:01:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-17 10:01:02 +0100 |
commit | 430d4427916b44e6a7c16db1899dfef2eec140fc (patch) | |
tree | e53417f50f9e4ab4b95bf0e9fbb18b0e00b0ce7e /app/javascript/flavours/glitch/features | |
parent | a85912b0d6d2ee68aa35794fbb51c5358768c092 (diff) | |
parent | 77dd4ab8f5d09b128db1e0227b2afcf73d8531e7 (diff) |
Merge pull request #1661 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features')
-rw-r--r-- | app/javascript/flavours/glitch/features/status/components/action_bar.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/status/components/action_bar.js b/app/javascript/flavours/glitch/features/status/components/action_bar.js index 6ed5f3865..eb4583026 100644 --- a/app/javascript/flavours/glitch/features/status/components/action_bar.js +++ b/app/javascript/flavours/glitch/features/status/components/action_bar.js @@ -146,6 +146,7 @@ class ActionBar extends React.PureComponent { const { status, intl } = this.props; const publicStatus = ['public', 'unlisted'].includes(status.get('visibility')); + const pinnableStatus = ['public', 'unlisted', 'private'].includes(status.get('visibility')); const mutingConversation = status.get('muted'); const writtenByMe = status.getIn(['account', 'id']) === me; @@ -158,7 +159,7 @@ class ActionBar extends React.PureComponent { } if (writtenByMe) { - if (publicStatus) { + if (pinnableStatus) { menu.push({ text: intl.formatMessage(status.get('pinned') ? messages.unpin : messages.pin), action: this.handlePinClick }); menu.push(null); } |