use less queries

merodiro · May 16, 2018 · aaa608d · aaa608d
1 parent cfb79ea
commit aaa608d
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/Friendable.php b/src/Friendable.php
@@ -71,19 +71,18 @@ public function deleteFriend($user)
 
     public function friends()
     {
-        $recipients = Friendship::whereSender($this)
-            ->accepted(1)
-            ->get(['user_requested'])
-            ->toArray();
-
-        $senders = Friendship::whereRecipient($this)
-            ->accepted(1)
-            ->get(['requester'])
-            ->toArray();
+        $friendsIds = Friendship::where(function ($query) {
+            $query->whereSender($this);
+        })->orWhere(function ($query) {
+            $query->whereRecipient($this);
+        })->accepted(1)->get(['user_requested', 'requester'])->toArray();
 
-        $friendsIds = array_merge($recipients, $senders);
+        $friendsIds = collect($friendsIds)->flatten()->unique()->reject(function ($id) {
+            return $id == $this->id;
+        });
 
         return static::whereIn('id', $friendsIds)
+            ->distinct()
             ->get();
     }