stevenoh0908/mastodon-sakyey
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Fix “Unblock” and “Unmute” actions being disabled when blocked

Browse Source 
Port dd27c7b917 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Claire
2026-03-05 10:10:49 +01:00
parent b6774279bd
commit fa3794ea27
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/javascript/flavours/glitch/components/follow_button.tsx
View File

@@ -138,6 +138,8 @@ export const FollowButton: React.FC<{
: messages.follow; : messages.follow;
let label; let label;
let disabled =
relationship?.blocked_by || account?.suspended || !!account?.moved;
if (!signedIn) { if (!signedIn) {
label = intl.formatMessage(followMessage); label = intl.formatMessage(followMessage);
@@ -147,12 +149,16 @@ export const FollowButton: React.FC<{
label = <LoadingIndicator />; label = <LoadingIndicator />;
} else if (relationship.muting && withUnmute) { } else if (relationship.muting && withUnmute) {
label = intl.formatMessage(messages.unmute); label = intl.formatMessage(messages.unmute);
disabled = false;
} else if (relationship.following) { } else if (relationship.following) {
label = intl.formatMessage(messages.unfollow); label = intl.formatMessage(messages.unfollow);
disabled = false;
} else if (relationship.blocking) { } else if (relationship.blocking) {
label = intl.formatMessage(messages.unblock); label = intl.formatMessage(messages.unblock);
disabled = false;
} else if (relationship.requested) { } else if (relationship.requested) {
label = intl.formatMessage(messages.followRequestCancel); label = intl.formatMessage(messages.followRequestCancel);
disabled = false;
} else if (relationship.followed_by && !account?.locked) { } else if (relationship.followed_by && !account?.locked) {
label = intl.formatMessage(messages.followBack); label = intl.formatMessage(messages.followBack);
} else { } else {
@@ -187,11 +193,7 @@ export const FollowButton: React.FC<{
return ( return (
<Button <Button
onClick={handleClick} onClick={handleClick}
disabled={ disabled={disabled}
relationship?.blocked_by ||
(!(relationship?.following || relationship?.requested) &&
(account?.suspended || !!account?.moved))
}
secondary={following || relationship?.blocking} secondary={following || relationship?.blocking}
compact={compact} compact={compact}
className={classNames(className, { 'button--destructive': following })} className={classNames(className, { 'button--destructive': following })}