Refactor follow requests

According to comments in PR overtrue#138

Resolves: overtrue#101

README.md

@@ -90,10 +90,10 @@ $user->followers;
 
 ### Follow Requests
 
-If you would like to have some follow requests to need to be accepted by the user being followed, simply override the **isPrivateUser()** method in the model that uses the **Followable** trait with your custom logic:
+If you would like to have some follow requests to need to be accepted by the user being followed, simply override the **needsToApproveFollowRequests()** method in the model that uses the **Followable** trait with your custom logic:
 
 ```php
-public function isPrivateUser()
+public function needsToApproveFollowRequests()
 {
     // Your custom logic here
     return (bool) $this->private;

src/Followable.php

@@ -24,7 +24,7 @@ trait Followable
     /**
      * @return bool
      */
-    public function isPrivateUser()
+    public function needsToApproveFollowRequests()
     {
         return false;
     }
@@ -36,7 +36,7 @@ public function isPrivateUser()
      */
     public function follow($user)
     {
-        $isPending = $user->isPrivateUser() ?: false;
+        $isPending = $user->needsToApproveFollowRequests() ?: false;
 
         $this->followings()->attach($user, [
             'accepted_at' => $isPending ? null : now()
@@ -67,10 +67,6 @@ public function toggleFollow($user)
      */
     public function rejectFollowRequestFrom($user)
     {
-        if ($user instanceof Model) {
-            $user = $user->getKey();
-        }
-
         $this->followers()->detach($user);
     }
 
@@ -79,10 +75,6 @@ public function rejectFollowRequestFrom($user)
      */
     public function acceptFollowRequestFrom($user)
     {
-        if ($user instanceof Model) {
-            $user = $user->getKey();
-        }
-
         $this->followers()->updateExistingPivot($user, ['accepted_at' => now()]);
     }
 
@@ -98,14 +90,12 @@ public function hasRequestedToFollow(Model $user): bool
         /* @var \Illuminate\Database\Eloquent\Model $this */
         if ($this->relationLoaded('followings')) {
             return $this->followings
-                ->filter(function ($following) {
-                    return $following->pivot->accepted_at === null;
-                })
+                ->whereNull('pivot.accepted_at')
                 ->contains($user);
         }
 
         return $this->followings()
-            ->whereNull('accepted_at')
+            ->wherePivot('accepted_at', null)
             ->where($this->getQualifiedKeyName(), $user)
             ->exists();
     }
@@ -124,14 +114,12 @@ public function isFollowing($user)
         /* @var \Illuminate\Database\Eloquent\Model $this */
         if ($this->relationLoaded('followings')) {
             return $this->followings
-                ->filter(function ($following) {
-                    return $following->pivot->accepted_at !== null;
-                })
+                ->whereNotNull('pivot.accepted_at')
                 ->contains($user);
         }
 
         return $this->followings()
-            ->whereNotNull('accepted_at')
+            ->wherePivot('accepted_at', '!=', null)
             ->where($this->getQualifiedKeyName(), $user)
             ->exists();
     }
@@ -150,14 +138,12 @@ public function isFollowedBy($user)
         /* @var \Illuminate\Database\Eloquent\Model $this */
         if ($this->relationLoaded('followers')) {
             return $this->followers
-                ->filter(function ($following) {
-                    return $following->pivot->accepted_at !== null;
-                })
+                ->whereNotNull('pivot.accepted_at')
                 ->contains($user);
         }
 
         return $this->followers()
-            ->whereNotNull('accepted_at')
+            ->wherePivot('accepted_at', '!=', null)
             ->where($this->getQualifiedKeyName(), $user)
             ->exists();
     }

tests/User.php

@@ -30,7 +30,7 @@ class User extends Model
     /**
      * @return bool
      */
-    public function isPrivateUser()
+    public function needsToApproveFollowRequests()
     {
         return $this->private ?? false;
     }