add friends_ids()

merodiro · May 16, 2018 · 0f54270 · 0f54270
1 parent aaa608d
commit 0f54270
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/Friendable.php b/src/Friendable.php
@@ -69,7 +69,7 @@ public function deleteFriend($user)
         return $friendshipStatus != 'not_friends';
     }
 
-    public function friends()
+    public function friends_ids()
     {
         $friendsIds = Friendship::where(function ($query) {
             $query->whereSender($this);
@@ -80,6 +80,12 @@ public function friends()
         $friendsIds = collect($friendsIds)->flatten()->unique()->reject(function ($id) {
             return $id == $this->id;
         });
+        return $friendsIds;
+    }
+
+    public function friends()
+    {
+        $friendsIds = $this->friends_ids();
 
         return static::whereIn('id', $friendsIds)
             ->distinct()
@@ -117,9 +123,11 @@ public function isFriendsWith($user)
 
     public function mutualFriends($user)
     {
-        $userFriends = $user->friends();
-        $friends = $this->friends();
+        $userFriends = $user->friends_ids();
+        $friends = $this->friends_ids();
+
+        $mutualIds = $userFriends->intersect($friends);
 
-        return $userFriends->intersect($friends);
+        return static::whereIn('id', $mutualIds)->get();
     }
 }