monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cancel follow request button sometimes saying “Follow back” (#31934)

This commit is contained in:
Claire 2024-09-16 15:20:44 +02:00 committed by GitHub
parent c620452fd7
commit 6c76a7a907
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/components/follow_button.tsx
View File

@ -75,10 +75,10 @@ export const FollowButton: React.FC<{
label = <LoadingIndicator />; label = <LoadingIndicator />;
} else if (relationship.following && relationship.followed_by) { } else if (relationship.following && relationship.followed_by) {
label = intl.formatMessage(messages.mutual); label = intl.formatMessage(messages.mutual);
} else if (!relationship.following && relationship.followed_by) {
label = intl.formatMessage(messages.followBack);
} else if (relationship.following || relationship.requested) { } else if (relationship.following || relationship.requested) {
label = intl.formatMessage(messages.unfollow); label = intl.formatMessage(messages.unfollow);
} else if (relationship.followed_by) {
label = intl.formatMessage(messages.followBack);
} else { } else {
label = intl.formatMessage(messages.follow); label = intl.formatMessage(messages.follow);
} }

4
app/javascript/mastodon/features/account/components/header.jsx
View File

@ -92,10 +92,10 @@ const messageForFollowButton = relationship => {
if (relationship.get('following') && relationship.get('followed_by')) { if (relationship.get('following') && relationship.get('followed_by')) {
return messages.mutual; return messages.mutual;
} else if (!relationship.get('following') && relationship.get('followed_by')) {
return messages.followBack;
} else if (relationship.get('following') || relationship.get('requested')) { } else if (relationship.get('following') || relationship.get('requested')) {
return messages.unfollow; return messages.unfollow;
} else if (relationship.get('followed_by')) {
return messages.followBack;
} else { } else {
return messages.follow; return messages.follow;
} }