UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-25 06:23:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #626 from Simounet/fix/private-pic

Browse source 
Fix private pic display
This commit is contained in:
daniel 2018-12-15 20:00:37 -07:00 committed by GitHub
commit 9d89ad18e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/PublicApiController.php
View file

@ -162,6 +162,7 @@ class PublicApiController extends Controller
switch ($status->scope) { switch ($status->scope) {
case 'public': case 'public':
case 'unlisted': case 'unlisted':
case 'private':
$user = Auth::check() ? Auth::user() : false; $user = Auth::check() ? Auth::user() : false;
if($user && $profile->is_private) { if($user && $profile->is_private) {
$follows = Follower::whereProfileId($user->profile->id) $follows = Follower::whereProfileId($user->profile->id)
@ -173,15 +174,6 @@ class PublicApiController extends Controller
} }
break; break;
case 'private':
$follows = Follower::whereProfileId($user->profile->id)
->whereFollowingId($profile->id)
->exists();
if($follows == false && $profile->id !== $user->profile->id) {
abort(404);
}
break;
case 'direct': case 'direct':
abort(404); abort(404);
break; break;