gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-10-06 00:52:42 +00:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Prioritise unmute over unfollow

Browse Source
This commit is contained in:
diondiondion 2025-09-25 17:20:27 +02:00
parent 23f6b1905e
commit 6fccf8cdfd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,14 +94,14 @@ export const FollowButton: React.FC<{
if (accountId === me) { if (accountId === me) {
return; return;
} else if (relationship.muting) {
dispatch(unmuteAccount(accountId));
} else if (account && (relationship.following || relationship.requested)) { } else if (account && (relationship.following || relationship.requested)) {
dispatch( dispatch(
openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }), openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }),
); );
} else if (relationship.blocking) { } else if (relationship.blocking) {
dispatch(unblockAccount(accountId)); dispatch(unblockAccount(accountId));
} else if (relationship.muting) {
dispatch(unmuteAccount(accountId));
} else { } else {
dispatch(followAccount(accountId)); dispatch(followAccount(accountId));
} }
@ -124,12 +124,12 @@ export const FollowButton: React.FC<{
label = intl.formatMessage(messages.editProfile); label = intl.formatMessage(messages.editProfile);
} else if (!relationship) { } else if (!relationship) {
label = <LoadingIndicator />; label = <LoadingIndicator />;
} else if (relationship.muting) {
label = intl.formatMessage(messages.unmute);
} else if (relationship.following) { } else if (relationship.following) {
label = intl.formatMessage(messages.unfollow); label = intl.formatMessage(messages.unfollow);
} else if (relationship.blocking) { } else if (relationship.blocking) {
label = intl.formatMessage(messages.unblock); label = intl.formatMessage(messages.unblock);
} else if (relationship.muting) {
label = intl.formatMessage(messages.unmute);
} else if (relationship.requested) { } else if (relationship.requested) {
label = intl.formatMessage(messages.followRequestCancel); label = intl.formatMessage(messages.followRequestCancel);
} else if (relationship.followed_by && !account?.locked) { } else if (relationship.followed_by && !account?.locked) {