gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 18

Merge remote-tracking branch 'parent/main' into upstream-20240918

Browse source
This commit is contained in:
KMY 2024-09-18 08:31:34 +09:00
commit 4ce35dd837
188 changed files with 1994 additions and 980 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/mastodon/components/follow_button.tsx
View file

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