From ca746717cb9b133f8299a7e5209ca540d0381cbe Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 21 Aug 2023 22:43:30 -0600 Subject: [PATCH 1/2] Update ApiV1Controller, add bookmarked to timeline entities --- app/Http/Controllers/Api/ApiV1Controller.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index a0a240ba1..92d5d43ee 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -2193,6 +2193,7 @@ class ApiV1Controller extends Controller if($pid) { $status['favourited'] = (bool) LikeService::liked($pid, $s['id']); $status['reblogged'] = (bool) ReblogService::get($pid, $status['id']); + $status['bookmarked'] = (bool) BookmarkService::get($pid, $status['id']); } return $status; }) @@ -2203,6 +2204,7 @@ class ApiV1Controller extends Controller if(!empty($status['reblog'])) { $status['reblog']['favourited'] = (bool) LikeService::liked($pid, $status['reblog']['id']); $status['reblog']['reblogged'] = (bool) ReblogService::get($pid, $status['reblog']['id']); + $status['bookmarked'] = (bool) BookmarkService::get($pid, $status['id']); } return $status; @@ -2244,6 +2246,7 @@ class ApiV1Controller extends Controller if($pid) { $status['favourited'] = (bool) LikeService::liked($pid, $s['id']); $status['reblogged'] = (bool) ReblogService::get($pid, $status['id']); + $status['bookmarked'] = (bool) BookmarkService::get($pid, $status['id']); } return $status; }) @@ -2254,6 +2257,7 @@ class ApiV1Controller extends Controller if(!empty($status['reblog'])) { $status['reblog']['favourited'] = (bool) LikeService::liked($pid, $status['reblog']['id']); $status['reblog']['reblogged'] = (bool) ReblogService::get($pid, $status['reblog']['id']); + $status['bookmarked'] = (bool) BookmarkService::get($pid, $status['id']); } return $status; @@ -2378,6 +2382,7 @@ class ApiV1Controller extends Controller if($user) { $status['favourited'] = (bool) LikeService::liked($user->profile_id, $k); $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $status['id']); + $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $status['id']); } return $status; }) @@ -3615,8 +3620,8 @@ class ApiV1Controller extends Controller abort_if(!$request->user(), 403); $pid = $request->user()->profile_id; - $home = $request->input('home.last_read_id'); - $notifications = $request->input('notifications.last_read_id'); + $home = $request->input('home[last_read_id]'); + $notifications = $request->input('notifications[last_read_id]'); if($home) { return $this->json(MarkerService::set($pid, 'home', $home)); From a7e4305043d6c975e99af28ec20ff0a450d8dbe9 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 21 Aug 2023 22:45:13 -0600 Subject: [PATCH 2/2] Bump version to 0.11.9 --- CHANGELOG.md | 6 +++--- config/pixelfed.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bdfa38426..357f69f72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ # Release Notes ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.9...dev) +- ([](https://github.com/pixelfed/pixelfed/commit/)) -## [v0.11.9 (2023-08-06)](https://github.com/pixelfed/pixelfed/compare/v0.11.8...v0.11.9) +## [v0.11.9 (2023-08-21)](https://github.com/pixelfed/pixelfed/compare/v0.11.8...v0.11.9) ### Added - Import from Instagram ([#4466](https://github.com/pixelfed/pixelfed/pull/4466)) ([cf3078c5](https://github.com/pixelfed/pixelfed/commit/cf3078c5)) @@ -57,8 +58,7 @@ - Update RemoteStatusDelete pipeline ([71e92261](https://github.com/pixelfed/pixelfed/commit/71e92261)) - Update RemoteStatusDelete pipeline ([fab8f25e](https://github.com/pixelfed/pixelfed/commit/fab8f25e)) - Update RemoteStatusPipeline, fix reply check ([618b6727](https://github.com/pixelfed/pixelfed/commit/618b6727)) -- ([](https://github.com/pixelfed/pixelfed/commit/)) -- ([](https://github.com/pixelfed/pixelfed/commit/)) +- Update ApiV1Controller, add bookmarked to timeline entities ([ca746717](https://github.com/pixelfed/pixelfed/commit/ca746717)) ## [v0.11.8 (2023-05-29)](https://github.com/pixelfed/pixelfed/compare/v0.11.7...v0.11.8) diff --git a/config/pixelfed.php b/config/pixelfed.php index 18e78b21d..fcdb1a4b7 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -23,7 +23,7 @@ return [ | This value is the version of your Pixelfed instance. | */ - 'version' => '0.11.8', + 'version' => '0.11.9', /* |--------------------------------------------------------------------------