Update ApiV1Controller, fix public timeline min/max id pagination

pixelfed · Jun 15, 2022 · a7613ba · a7613ba
1 parent 154f234
commit a7613ba
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php
@@ -2015,6 +2015,19 @@ public function timelinePublic(Request $request)
         }
 
 		$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 @@ public function timelinePublic(Request $request)
 		})
 		->take($limit)
 		->values();
-		// ->toArray();
 
 		$baseUrl = config('app.url') . '/api/v1/timelines/public?limit=' . $limit . '&';
 		if($remote) {