From 94069db9b8974c8a7f68fd6549a0dcc933abba35 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 10 Feb 2023 04:53:36 -0700 Subject: [PATCH] Update ApiV1Controller, add pixelfed entity support to bookmarks endpoint --- app/Http/Controllers/Api/ApiV1Controller.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index 2c8ebfbdd..4447d0753 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -3005,6 +3005,7 @@ class ApiV1Controller extends Controller 'min_id' => 'nullable|integer|min:0' ]); + $pe = $request->has('_pe'); $pid = $request->user()->profile_id; $limit = $request->input('limit') ?? 20; $max_id = $request->input('max_id'); @@ -3018,8 +3019,8 @@ class ApiV1Controller extends Controller ->orderByDesc('id') ->cursorPaginate($limit); - $bookmarks = $bookmarkQuery->map(function($bookmark) use($pid) { - $status = StatusService::getMastodon($bookmark->status_id, false); + $bookmarks = $bookmarkQuery->map(function($bookmark) use($pid, $pe) { + $status = $pe ? StatusService::get($bookmark->status_id, false) : StatusService::getMastodon($bookmark->status_id, false); if($status) { $status['bookmarked'] = true;