From 5cf9ba785f40979205d0f2f512e6ca6119a8c049 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 11 Mar 2023 05:45:20 -0700 Subject: [PATCH 1/3] Update ApiV1Controller, increase home timeline max limit to 100 to fix compatibility with mastoapi --- app/Http/Controllers/Api/ApiV1Controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index 91d778995..9909d5d2d 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -2076,7 +2076,7 @@ class ApiV1Controller extends Controller 'page' => 'sometimes|integer|max:40', 'min_id' => 'sometimes|integer|min:0|max:' . PHP_INT_MAX, 'max_id' => 'sometimes|integer|min:0|max:' . PHP_INT_MAX, - 'limit' => 'sometimes|integer|min:1|max:80' + 'limit' => 'sometimes|integer|min:1|max:100' ]); $napi = $request->has(self::PF_API_ENTITY_KEY); From deb2697115c8226437bee798ceee6dab207bbe3e Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 11 Mar 2023 05:49:39 -0700 Subject: [PATCH 2/3] Update ApiV1Controller, preserve album order. Fixes #3708 --- app/Http/Controllers/Api/ApiV1Controller.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index 9909d5d2d..dee9fecdb 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -2819,6 +2819,7 @@ class ApiV1Controller extends Controller if($m->profile_id !== $user->profile_id || $m->status_id) { abort(403, 'Invalid media id'); } + $m->order = $k + 1; $m->status_id = $status->id; $m->save(); array_push($mimes, $m->mime); From feeaedd88e642408ec154df685b95920755611fe Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 11 Mar 2023 05:50:31 -0700 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ec1ac4fa..2b1c909b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -126,6 +126,8 @@ - Update FollowerController, remove deprecated /i/follow endpoint ([4739d614](https://github.com/pixelfed/pixelfed/commit/4739d614)) - Update queue config, set "after_commit" to true ([304ea956](https://github.com/pixelfed/pixelfed/commit/304ea956)) - Update ApiV1Controller, fix home timeline bug ([a8ec8445](https://github.com/pixelfed/pixelfed/commit/a8ec8445)) +- Update ApiV1Controller, increase home timeline max limit to 100 to fix compatibility with mastoapi ([5cf9ba78](https://github.com/pixelfed/pixelfed/commit/5cf9ba78)) +- Update ApiV1Controller, preserve album order. Fixes #3708 ([deb26971](https://github.com/pixelfed/pixelfed/commit/deb26971)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)