Update FollowerController

6 years ago · dccaa2bd94
parent 38a0fd30fe
commit dccaa2bd94
1 changed files with 7 additions and 3 deletions
--- a/app/Http/Controllers/FollowerController.php
+++ b/app/Http/Controllers/FollowerController.php
@ -89,8 +89,12 @@ class FollowerController extends Controller
            } 
            FollowPipeline::dispatch($follower);
        } else {
-            $follower = Follower::whereProfileId($user->id)->whereFollowingId($target->id)->firstOrFail();
-            if($remote == true) {
+            $request = FollowRequest::whereFollowerId($user->id)->whereFollowingId($target->id)->exists();
+            $follower = Follower::whereProfileId($user->id)->whereFollowingId($target->id)->exists();
+            if($remote == true && $request && !$follower) {
+                $this->sendFollow($user, $target);
+            }
+            if($remote == true && $follower) {
                $this->sendUndoFollow($user, $target);
            }
            $follower->delete();