Merge pull request #5514 from pixelfed/staging

Update PublicApiController
1 month ago · 13af8c5133
parent 0cc9ed3634 629fb5a47a
commit 13af8c5133
1 changed files with 6 additions and 0 deletions
--- a/app/Http/Controllers/PublicApiController.php
+++ b/app/Http/Controllers/PublicApiController.php
@ -730,6 +730,9 @@ class PublicApiController extends Controller
            ->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 @@ class PublicApiController extends Controller
                return $status;
            })
            ->filter(function ($s) use ($onlyMedia) {
+                if (! $s) {
+                    return false;
+                }
                if ($onlyMedia) {
                    if (
                        ! isset($s['media_attachments']) ||