update friend button to handle being blocked

Author: notbakaneko

app/Http/Controllers/UsersController.php

@@ -956,6 +956,7 @@ private function showUserIncludes()
             ...UserTransformer::PROFILE_HEADER_INCLUDES,
             'account_history',
             'current_season_stats',
+            'current_user_attributes',
             'daily_challenge_user_stats',
             'matchmaking_stats.pool',
             'page',

app/Transformers/UserCompactTransformer.php

@@ -62,6 +62,7 @@ class UserCompactTransformer extends TransformerAbstract
         'country',
         'cover',
         'current_season_stats',
+        'current_user_attributes',
         'daily_challenge_user_stats',
         'favourite_beatmapset_count',
         'follow_user_mapping',
@@ -244,6 +245,14 @@ public function includeCurrentSeasonStats(User $user): Primitive
             : $this->primitive((new SeasonStats($user, $season))->get());
     }
 
+    public function includeCurrentUserAttributes(User $user): Primitive
+    {
+        $currentUser = \Auth::user();
+        return $this->primitive($currentUser === null ? null : [
+            'has_blocked' => $user->hasBlocked($currentUser),
+        ]);
+    }
+
     public function includeDailyChallengeUserStats(User $user)
     {
         return $this->item(

resources/js/components/friend-button.tsx

@@ -19,7 +19,7 @@ const bn = 'user-action-button';
 
 interface Props {
   alwaysVisible: boolean;
-  container?: HTMLElement;
+  blocked?: boolean;
   followers?: number;
   modifiers?: Modifiers;
   userId: number;
@@ -74,6 +74,10 @@ export default class FriendButton extends React.Component<Props> {
 
   @computed
   private get title() {
+    if (this.props.blocked) {
+      return trans('friends.blocked');
+    }
+
     if (!this.isVisible) {
       return trans('friends.buttons.disabled');
     }
@@ -119,7 +123,7 @@ export default class FriendButton extends React.Component<Props> {
       : (this.friend.mutual ? 'mutual' : 'friend');
 
     const blockClass = classWithModifiers(bn, this.props.modifiers, extraModifier);
-    const disabled = !this.isVisible || this.loading || this.isFriendLimit && this.friend == null;
+    const disabled = !this.isVisible || this.loading || this.props.blocked || this.isFriendLimit && this.friend == null;
 
     return (
       <div title={this.title}>

resources/js/interfaces/user-json.ts

@@ -32,6 +32,9 @@ interface UserJsonAvailableIncludes {
   country: CountryJson | null;
   cover: UserCoverJson;
   current_season_stats: SeasonStatsJson | null;
+  current_user_attributes: {
+    has_blocked: boolean;
+  } | null;
   daily_challenge_user_stats: DailyChallengeUserStatsJson;
   favourite_beatmapset_count: number;
   follow_user_mapping: number[];

resources/js/profile-page/detail-bar.tsx

@@ -29,6 +29,7 @@ export default class DetailBar extends React.Component<Props> {
       <div className='profile-detail-bar'>
         <FriendButton
           alwaysVisible
+          blocked={this.props.user.current_user_attributes?.has_blocked}
           followers={this.props.user.follower_count}
           modifiers='profile-page'
           userId={this.props.user.id}