chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #432 from pixelfed/frontend-ui-refactor 

Update FollowerController, prevent users from following private profi…
This commit is contained in:
daniel 2018-09-01 23:21:35 -06:00 committed by GitHub
parent 53b70fae45 77d4e45729
commit b3ecc31ec1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/FollowerController.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Follower; use App\Follower;
use App\FollowRequest;
use App\Jobs\FollowPipeline\FollowPipeline; use App\Jobs\FollowPipeline\FollowPipeline;
use App\Profile; use App\Profile;
use Auth; use Auth;
@ -18,15 +19,26 @@ class FollowerController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$this->validate($request, [ $this->validate($request, [
'item' => 'required|integer', 'item' => 'required|integer',
]); ]);
$item = $request->input('item');
$this->handleFollowRequest($item);
return redirect()->back();
}
protected function handleFollowRequest($item)
{
$user = Auth::user()->profile; $user = Auth::user()->profile;
$target = Profile::where('id', '!=', $user->id)->findOrFail($request->input('item')); $target = Profile::where('id', '!=', $user->id)->findOrFail($item);
$private = (bool) $target->is_private;
$isFollowing = Follower::whereProfileId($user->id)->whereFollowingId($target->id)->count(); $isFollowing = Follower::whereProfileId($user->id)->whereFollowingId($target->id)->count();
if ($isFollowing == 0) { if($private == true) {
$follow = new FollowRequest;
$follow->follower_id = $user->id;
$follow->following_id = $target->id;
$follow->save();
} elseif ($isFollowing == 0) {
$follower = new Follower(); $follower = new Follower();
$follower->profile_id = $user->id; $follower->profile_id = $user->id;
$follower->following_id = $target->id; $follower->following_id = $target->id;
@ -36,7 +48,5 @@ class FollowerController extends Controller
$follower = Follower::whereProfileId($user->id)->whereFollowingId($target->id)->firstOrFail(); $follower = Follower::whereProfileId($user->id)->whereFollowingId($target->id)->firstOrFail();
$follower->delete(); $follower->delete();
} }
return redirect()->back();
} }
} }