diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2017-12-06 19:59:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-06 19:59:15 -0500 |
commit | de5620995175b7c1c0fc458bd78c12d8c5860aad (patch) | |
tree | 5cc51ad8d5b972aa4a1c1f6cb52451f08e8911e4 /app/javascript/flavours/glitch/features/account/components/action_bar.js | |
parent | c63e6c9a2ca064a8ff65c8558f38abe9ab037620 (diff) | |
parent | 133f5b3b538263c777243900af114289c986523a (diff) |
Merge pull request #240 from glitch-soc/copy-api-changes
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239)
Diffstat (limited to 'app/javascript/flavours/glitch/features/account/components/action_bar.js')
-rw-r--r-- | app/javascript/flavours/glitch/features/account/components/action_bar.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/features/account/components/action_bar.js b/app/javascript/flavours/glitch/features/account/components/action_bar.js index 7c9c1af4e..df8cb3733 100644 --- a/app/javascript/flavours/glitch/features/account/components/action_bar.js +++ b/app/javascript/flavours/glitch/features/account/components/action_bar.js @@ -63,9 +63,8 @@ export default class ActionBar extends React.PureComponent { if (account.get('id') === me) { menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' }); } else { - const following = account.getIn(['relationship', 'following']); - if (following) { - if (following.get('reblogs')) { + if (account.getIn(['relationship', 'following'])) { + if (account.getIn(['relationship', 'showing_reblogs'])) { menu.push({ text: intl.formatMessage(messages.hideReblogs, { name: account.get('username') }), action: this.props.onReblogToggle }); } else { menu.push({ text: intl.formatMessage(messages.showReblogs, { name: account.get('username') }), action: this.props.onReblogToggle }); |