Update ApiV1Controller, fix pagination header. Fixes #3354

pixelfed · Sep 19, 2022 · 4fe07e6 · 4fe07e6
1 parent 49ceed7
commit 4fe07e6
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php
@@ -1897,15 +1897,15 @@ public function accountNotifications(Request $request)
 		}
 
 		if($maxId) {
-			$link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next"';
+			$link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
 		}
 
 		if($minId) {
-			$link = '<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';
+			$link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
 		}
 
 		if($maxId && $minId) {
-			$link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next",<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';
+			$link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
 		}
 
 		$headers = isset($link) ? ['Link' => $link] : [];
@@ -2019,15 +2019,15 @@ public function timelineHome(Request $request)
 		}
 
 		if($maxId) {
-			$link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next"';
+			$link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
 		}
 
 		if($minId) {
-			$link = '<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';
+			$link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
 		}
 
 		if($maxId && $minId) {
-			$link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next",<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';
+			$link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
 		}
 
 		$headers = isset($link) ? ['Link' => $link] : [];
@@ -2136,15 +2136,15 @@ public function timelinePublic(Request $request)
 		}
 
 		if($maxId) {
-			$link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next"';
+			$link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
 		}
 
 		if($minId) {
-			$link = '<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';
+			$link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
 		}
 
 		if($maxId && $minId) {
-			$link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next",<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';
+			$link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
 		}
 
 		$headers = isset($link) ? ['Link' => $link] : [];