diff options
author | ThibG <thib@sitedethib.com> | 2020-05-13 21:20:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-13 21:20:45 +0200 |
commit | 92f85bea528c5eca97a2f075c53f7dcafdf5cb41 (patch) | |
tree | 18faa6a01b8e2a3106f80b2efb70964e17f33c99 /app | |
parent | 48503384d00525fe61a038bdb8a55868fdc1db92 (diff) |
Change “hide/show boosts from …” menu to be hidden when the account is muted (#13748)
Otherwise, it may mislead users into believing this setting is an exception to the muting behavior. Fixes #13744
Diffstat (limited to 'app')
-rw-r--r-- | app/javascript/mastodon/features/account/components/header.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js index 92780a70b..8c85bbc39 100644 --- a/app/javascript/mastodon/features/account/components/header.js +++ b/app/javascript/mastodon/features/account/components/header.js @@ -192,10 +192,12 @@ class Header extends ImmutablePureComponent { menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' }); } else { 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 }); + if (!account.getIn(['relationship', 'muting'])) { + 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 }); + } } menu.push({ text: intl.formatMessage(account.getIn(['relationship', 'endorsed']) ? messages.unendorse : messages.endorse), action: this.props.onEndorseToggle }); |