chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

Update ApiV1Controller, fix pagination header. Fixes #3354

Browse source
This commit is contained in:
Daniel Supernault 2022-09-18 21:44:37 -06:00
parent 49ceed7169
commit 4fe07e6fe2
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -1897,15 +1897,15 @@ class ApiV1Controller extends Controller
} }
if($maxId) { if($maxId) {
$link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next"'; $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
} }
if($minId) { if($minId) {
$link = '<'.$baseUrl.'min_id='.$minId.'>; rel="prev"'; $link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
} }
if($maxId && $minId) { 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] : []; $headers = isset($link) ? ['Link' => $link] : [];
@ -2019,15 +2019,15 @@ class ApiV1Controller extends Controller
} }
if($maxId) { if($maxId) {
$link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next"'; $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
} }
if($minId) { if($minId) {
$link = '<'.$baseUrl.'min_id='.$minId.'>; rel="prev"'; $link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
} }
if($maxId && $minId) { 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] : []; $headers = isset($link) ? ['Link' => $link] : [];
@ -2136,15 +2136,15 @@ class ApiV1Controller extends Controller
} }
if($maxId) { if($maxId) {
$link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next"'; $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
} }
if($minId) { if($minId) {
$link = '<'.$baseUrl.'min_id='.$minId.'>; rel="prev"'; $link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
} }
if($maxId && $minId) { 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] : []; $headers = isset($link) ? ['Link' => $link] : [];