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

Update PublicApiController

Browse source
This commit is contained in:
Daniel Supernault 2019-04-17 23:58:08 -06:00
parent 292e6e18b1
commit 6f72994a49
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -528,7 +528,7 @@ class PublicApiController extends Controller
{
abort_unless(Auth::check(), 403);
$profile = Profile::with('user')->whereNull('status')->whereNull('domain')->findOrFail($id);
if($profile->is_private || !$profile->user->settings->show_profile_followers && Auth::id() != $profile->user_id) {
if(Auth::id() != $profile->user_id && $profile->is_private || !$profile->user->settings->show_profile_followers) {
return response()->json([]);
}
$followers = $profile->followers()->orderByDesc('followers.created_at')->paginate(10);
@ -542,7 +542,7 @@ class PublicApiController extends Controller
{
abort_unless(Auth::check(), 403);
$profile = Profile::with('user')->whereNull('status')->whereNull('domain')->findOrFail($id);
if($profile->is_private || !$profile->user->settings->show_profile_following && Auth::id() != $profile->user_id) {
if(Auth::id() != $profile->user_id && $profile->is_private || !$profile->user->settings->show_profile_following) {
return response()->json([]);
}
$following = $profile->following()->orderByDesc('followers.created_at')->paginate(10);