nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #6128 - Display unfollow button even if account moved (#6258)

This commit is contained in:
Eugen Rochko 2018-01-15 18:42:15 +01:00 committed by GitHub
parent 74c1c9ec01
commit 3987bd18a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/components/account.js
View File

@ -93,7 +93,7 @@ export default class Account extends ImmutablePureComponent {
{hidingNotificationsButton}
</Fragment>
);
} else if (!account.get('moved')) {
} else if (!account.get('moved') || following) {
buttons = <IconButton icon={following ? 'user-times' : 'user-plus'} title={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} active={following} />;
}
}

2
app/javascript/mastodon/features/account/components/header.js
View File

@ -103,7 +103,7 @@ export default class Header extends ImmutablePureComponent {
}
}
if (account.get('moved')) {
if (account.get('moved') && !account.getIn(['relationship', 'following'])) {
actionBtn = '';
}