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

Update FollowerController

This commit is contained in:
Daniel Supernault 2019-01-12 13:46:14 -07:00
parent a94e0ce40d
commit ba8c101703
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ class FollowerController extends Controller
$user = Auth::user()->profile; $user = Auth::user()->profile;
$target = Profile::where('id', '!=', $user->id)->whereNull('status')->findOrFail($item); $target = Profile::where('id', '!=', $user->id)->whereNull('status')->findOrFail($item);
$private = (bool) $target->is_private; $private = (bool) $target->is_private;
$remote = (bool) $target->domain;
$blocked = UserFilter::whereUserId($target->id) $blocked = UserFilter::whereUserId($target->id)
->whereFilterType('block') ->whereFilterType('block')
->whereFilterableId($user->id) ->whereFilterableId($user->id)
@ -51,7 +52,7 @@ class FollowerController extends Controller
$isFollowing = Follower::whereProfileId($user->id)->whereFollowingId($target->id)->count(); $isFollowing = Follower::whereProfileId($user->id)->whereFollowingId($target->id)->count();
if($private == true && $isFollowing == 0) { if($private == true && $isFollowing == 0 || $remote == true) {
$follow = FollowRequest::firstOrCreate([ $follow = FollowRequest::firstOrCreate([
'follower_id' => $user->id, 'follower_id' => $user->id,
'following_id' => $target->id 'following_id' => $target->id