Update ApiV1Controller, fix pagination header. Fixes #3354

dansup · dansup · commit 4fe07e6fe257 · 2022-09-18T21:44:37.000-06:00
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] : [];

Original file line number	Diff line number	Diff line change
`@@ -1897,15 +1897,15 @@ public function accountNotifications(Request $request)`
`1897`	`1897`	`}`
`1898`	`1898`
`1899`	`1899`	`if($maxId) {`
`1900`		`- $link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next"';`
	`1900`	`+ $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';`
`1901`	`1901`	`}`
`1902`	`1902`
`1903`	`1903`	`if($minId) {`
`1904`		`- $link = '<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';`
	`1904`	`+ $link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';`
`1905`	`1905`	`}`
`1906`	`1906`
`1907`	`1907`	`if($maxId && $minId) {`
`1908`		`- $link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next",<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';`
	`1908`	`+ $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';`
`1909`	`1909`	`}`
`1910`	`1910`
`1911`	`1911`	`$headers = isset($link) ? ['Link' => $link] : [];`
`@@ -2019,15 +2019,15 @@ public function timelineHome(Request $request)`
`2019`	`2019`	`}`
`2020`	`2020`
`2021`	`2021`	`if($maxId) {`
`2022`		`- $link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next"';`
	`2022`	`+ $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';`
`2023`	`2023`	`}`
`2024`	`2024`
`2025`	`2025`	`if($minId) {`
`2026`		`- $link = '<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';`
	`2026`	`+ $link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';`
`2027`	`2027`	`}`
`2028`	`2028`
`2029`	`2029`	`if($maxId && $minId) {`
`2030`		`- $link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next",<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';`
	`2030`	`+ $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';`
`2031`	`2031`	`}`
`2032`	`2032`
`2033`	`2033`	`$headers = isset($link) ? ['Link' => $link] : [];`
`@@ -2136,15 +2136,15 @@ public function timelinePublic(Request $request)`
`2136`	`2136`	`}`
`2137`	`2137`
`2138`	`2138`	`if($maxId) {`
`2139`		`- $link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next"';`
	`2139`	`+ $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';`
`2140`	`2140`	`}`
`2141`	`2141`
`2142`	`2142`	`if($minId) {`
`2143`		`- $link = '<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';`
	`2143`	`+ $link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';`
`2144`	`2144`	`}`
`2145`	`2145`
`2146`	`2146`	`if($maxId && $minId) {`
`2147`		`- $link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next",<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';`
	`2147`	`+ $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';`
`2148`	`2148`	`}`
`2149`	`2149`
`2150`	`2150`	`$headers = isset($link) ? ['Link' => $link] : [];`