From dcb7ba9c7ae81c25665985616f59a11ef5459bc3 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 9 Jan 2022 19:32:41 -0700 Subject: [PATCH] Update PublicApiController, fix public timeline endpoint --- app/Http/Controllers/PublicApiController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php index a15c517df..eb1721483 100644 --- a/app/Http/Controllers/PublicApiController.php +++ b/app/Http/Controllers/PublicApiController.php @@ -323,6 +323,9 @@ class PublicApiController extends Controller ->get() ->map(function($s) use ($user) { $status = StatusService::getFull($s->id, $user->profile_id); + if(!$status) { + return false; + } $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id); return $status; }) @@ -362,6 +365,9 @@ class PublicApiController extends Controller ->get() ->map(function($s) use ($user) { $status = StatusService::getFull($s->id, $user->profile_id); + if(!$status) { + return false; + } $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id); return $status; }) @@ -777,7 +783,6 @@ class PublicApiController extends Controller $visibility = ['public', 'unlisted']; } } - $dir = $min_id ? '>' : '<'; $id = $min_id ?? $max_id; $res = Status::whereProfileId($profile['id'])