From a3404a20e1daf455c348778969766ce44628bb63 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 23 Sep 2019 18:47:41 -0600 Subject: [PATCH] Update FollowerController, fix unfollow bug --- app/Http/Controllers/FollowerController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Http/Controllers/FollowerController.php b/app/Http/Controllers/FollowerController.php index dfac38ce..97a3700d 100644 --- a/app/Http/Controllers/FollowerController.php +++ b/app/Http/Controllers/FollowerController.php @@ -38,7 +38,6 @@ class FollowerController extends Controller { $user = Auth::user()->profile; - $target = Profile::where('id', '!=', $user->id)->whereNull('status')->findOrFail($item); $private = (bool) $target->is_private; $remote = (bool) $target->domain; @@ -54,7 +53,7 @@ class FollowerController extends Controller $isFollowing = Follower::whereProfileId($user->id)->whereFollowingId($target->id)->exists(); - if($private == true && $isFollowing == 0 || $remote == true) { + if($private == true && $isFollowing == 0 && $remote == true) { if($user->following()->count() >= Follower::MAX_FOLLOWING) { abort(400, 'You cannot follow more than ' . Follower::MAX_FOLLOWING . ' accounts'); }