Merge pull request #5514 from pixelfed/staging

Update PublicApiController
pixelfed · Jan 18, 2025 · 13af8c5 · 13af8c5
2 parents 0cc9ed3 + 629fb5a
commit 13af8c5
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php
@@ -730,6 +730,9 @@ public function accountStatuses(Request $request, $id)
             ->map(function ($s) use ($user) {
                 try {
                     $status = StatusService::get($s->id, false);
+                    if (! $status) {
+                        return false;
+                    }
                 } catch (\Exception $e) {
                     $status = false;
                 }
@@ -740,6 +743,9 @@ public function accountStatuses(Request $request, $id)
                 return $status;
             })
             ->filter(function ($s) use ($onlyMedia) {
+                if (! $s) {
+                    return false;
+                }
                 if ($onlyMedia) {
                     if (
                         ! isset($s['media_attachments']) ||