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

2024-11-28 19:45:31 +09:00 · 2024-11-28 19:45:31 +09:00 · 3359008684
commit 3359008684
parent f1e701febf 46c43d263c
71 changed files with 1505 additions and 2295 deletions
--- a/app/javascript/mastodon/components/follow_button.tsx
+++ b/app/javascript/mastodon/components/follow_button.tsx
@ -103,7 +103,12 @@ export const FollowButton: React.FC<{
  return (
    <Button
      onClick={handleClick}
-      disabled={relationship?.blocked_by || relationship?.blocking}
+      disabled={
+        relationship?.blocked_by ||
+        relationship?.blocking ||
+        (!(relationship?.following || relationship?.requested) &&
+          (account?.suspended || !!account?.moved))
+      }
      secondary={following}
      className={following ? 'button--destructive' : undefined}
    >