logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 3987bd18a4bfaee49ea9a3439fc51610aeca6c2c
parent: 74c1c9ec01addc7474d74712f76fb6d6d5eecdf7
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Mon, 15 Jan 2018 18:42:15 +0100

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


Diffstat:

Mapp/javascript/mastodon/components/account.js2+-
Mapp/javascript/mastodon/features/account/components/header.js2+-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/components/account.js b/app/javascript/mastodon/components/account.js @@ -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} />; } } diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js @@ -103,7 +103,7 @@ export default class Header extends ImmutablePureComponent { } } - if (account.get('moved')) { + if (account.get('moved') && !account.getIn(['relationship', 'following'])) { actionBtn = ''; }