@@ -231,7 +231,7 @@ |
||
| 231 | 231 | /** |
| 232 | 232 | * Get the number of friends |
| 233 | 233 | * |
| 234 | - * @return \Illuminate\Database\Eloquent\Collection |
|
| 234 | + * @return integer |
|
| 235 | 235 | */ |
| 236 | 236 | public function getFriendsCount() |
| 237 | 237 | { |
@@ -313,13 +313,13 @@ |
||
| 313 | 313 | |
| 314 | 314 | |
| 315 | 315 | $fofs = Friendship::where('status', Status::ACCEPTED) |
| 316 | - ->where(function ($query) use ($friendIds) { |
|
| 317 | - $query->where(function ($q) use ($friendIds) { |
|
| 318 | - $q->whereIn('sender_id', $friendIds); |
|
| 319 | - })->orWhere(function ($q) use ($friendIds) { |
|
| 320 | - $q->whereIn('recipient_id', $friendIds); |
|
| 321 | - }); |
|
| 322 | - })->get(['sender_id', 'recipient_id']); |
|
| 316 | + ->where(function ($query) use ($friendIds) { |
|
| 317 | + $query->where(function ($q) use ($friendIds) { |
|
| 318 | + $q->whereIn('sender_id', $friendIds); |
|
| 319 | + })->orWhere(function ($q) use ($friendIds) { |
|
| 320 | + $q->whereIn('recipient_id', $friendIds); |
|
| 321 | + }); |
|
| 322 | + })->get(['sender_id', 'recipient_id']); |
|
| 323 | 323 | |
| 324 | 324 | $fofIds = array_unique( |
| 325 | 325 | array_merge($fofs->pluck('sender_id')->all(), $fofs->lists('recipient_id')->all()) |