Merge pull request #3195 from pixelfed/staging

Staging
2024-11-23 15:01:27 +00:00 · 2022-01-28 23:23:43 -07:00 · 2022-01-28 23:23:43 -07:00 · c909e9757a
commit c909e9757a
parent a2c56c4e71 5caf160633
3 changed files with 3 additions and 0 deletions
--- a/app/Http/Controllers/InternalApiController.php
+++ b/app/Http/Controllers/InternalApiController.php
@ -323,6 +323,9 @@ class InternalApiController extends Controller
 			->simplePaginate(10)
 			->map(function($bookmark) use($pid) {
 				$status = StatusService::get($bookmark->status_id, false);
+				if(!$status) {
+					return false;
+				}
 				$status['bookmarked_at'] = $bookmark->created_at->format('c');

 				if($status) {
--- a/public/js/spa.js
+++ b/public/js/spa.js
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json