From a7613baee658003f25d13daf96710be01a98c94f Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 15 Jun 2022 03:32:04 -0600 Subject: [PATCH] Update ApiV1Controller, fix public timeline min/max id pagination --- app/Http/Controllers/Api/ApiV1Controller.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index 8723dfd7d..6478284b8 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -2015,6 +2015,19 @@ class ApiV1Controller extends Controller } $res = collect($feed) + ->filter(function($k) use($min, $max) { + if(!$min && !$max) { + return true; + } + + if($min) { + return $min != $k; + } + + if($max) { + return $max != $k; + } + }) ->map(function($k) use($user) { $status = StatusService::getMastodon($k); if(!$status || !isset($status['account']) || !isset($status['account']['id'])) { @@ -2032,7 +2045,6 @@ class ApiV1Controller extends Controller }) ->take($limit) ->values(); - // ->toArray(); $baseUrl = config('app.url') . '/api/v1/timelines/public?limit=' . $limit . '&'; if($remote) {