From 74a719bdfd95ce37f8227fe6b060024342d6e9aa Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 5 Aug 2019 21:16:29 -0600 Subject: [PATCH] Update RelationshipTransformer --- app/Transformer/Api/RelationshipTransformer.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/Transformer/Api/RelationshipTransformer.php b/app/Transformer/Api/RelationshipTransformer.php index 280d72392..89e1decd8 100644 --- a/app/Transformer/Api/RelationshipTransformer.php +++ b/app/Transformer/Api/RelationshipTransformer.php @@ -3,7 +3,10 @@ namespace App\Transformer\Api; use Auth; -use App\Profile; +use App\{ + FollowRequest, + Profile +}; use League\Fractal; class RelationshipTransformer extends Fractal\TransformerAbstract @@ -12,6 +15,12 @@ class RelationshipTransformer extends Fractal\TransformerAbstract { $auth = Auth::check(); $user = $auth ? Auth::user()->profile : false; + $requested = false; + if($user) { + $requested = FollowRequest::whereFollowerId($user->id) + ->whereFollowingId($profile->id) + ->exists(); + } return [ 'id' => (string) $profile->id, 'following' => $auth ? $user->follows($profile) : false, @@ -19,7 +28,7 @@ class RelationshipTransformer extends Fractal\TransformerAbstract 'blocking' => $auth ? $user->blockedIds()->contains($profile->id) : false, 'muting' => $auth ? $user->mutedIds()->contains($profile->id) : false, 'muting_notifications' => null, - 'requested' => null, + 'requested' => $requested, 'domain_blocking' => null, 'showing_reblogs' => null, 'endorsed' => false