Don't allow people to follow people they blocked without unblocking first

2017-02-05 20:58:09 +01:00
parent eee8afb0b7
commit 0af3401553
2 changed files with 2 additions and 2 deletions
--- a/app/assets/javascripts/components/features/account/components/header.jsx
+++ b/app/assets/javascripts/components/features/account/components/header.jsx
@ -44,7 +44,7 @@ const Header = React.createClass({
            <IconButton size={26} disabled={true} icon='hourglass' title={intl.formatMessage(messages.requested)} />
          </div>
        );
-      } else {
+      } else if (!account.getIn(['relationship', 'blocking'])) {
        actionBtn = (
          <div style={{ position: 'absolute', top: '10px', left: '20px' }}>
            <IconButton size={26} icon={account.getIn(['relationship', 'following']) ? 'user-times' : 'user-plus'} active={account.getIn(['relationship', 'following'])} title={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={this.props.onFollow} />