UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-02-03 18:30:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update ApiV1Controller, add miissing pagination header

Browse source
This commit is contained in:
Daniel Supernault 2022-04-02 16:34:12 -06:00
parent a5cdc28b6c
commit 5649873ab8
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 56 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1702,8 +1702,7 @@ class ApiV1Controller extends Controller
return $status && isset($status['account']); return $status && isset($status['account']);
}) })
->take($limit) ->take($limit)
->values() ->values();
->toArray();
} else { } else {
$res = Status::select( $res = Status::select(
'id', 'id',
@ -1734,11 +1733,35 @@ class ApiV1Controller extends Controller
return $status && isset($status['account']); return $status && isset($status['account']);
}) })
->take($limit) ->take($limit)
->values() ->values();
->toArray();
} }
return $this->json($res); $baseUrl = config('app.url') . '/api/v1/timelines/home?limit=' . $limit . '&';
$minId = $res->map(function($s) {
return ['id' => $s['id']];
})->min('id');
$maxId = $res->map(function($s) {
return ['id' => $s['id']];
})->max('id');
if($minId == $maxId) {
$minId = null;
}
if($maxId) {
$link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next"';
}
if($minId) {
$link = '<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';
}
if($maxId && $minId) {
$link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next",<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';
}
$headers = isset($link) ? ['Link' => $link] : [];
return $this->json($res->toArray(), 200, $headers);
} }
/** /**
@ -1792,10 +1815,35 @@ class ApiV1Controller extends Controller
return $s && isset($s['account']) && in_array($s['account']['id'], $filtered) == false; return $s && isset($s['account']) && in_array($s['account']['id'], $filtered) == false;
}) })
->take($limit) ->take($limit)
->values() ->values();
->toArray(); // ->toArray();
return $this->json($res); $baseUrl = config('app.url') . '/api/v1/timelines/public?limit=' . $limit . '&';
$minId = $res->map(function($s) {
return ['id' => $s['id']];
})->min('id');
$maxId = $res->map(function($s) {
return ['id' => $s['id']];
})->max('id');
if($minId == $maxId) {
$minId = null;
}
if($maxId) {
$link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next"';
}
if($minId) {
$link = '<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';
}
if($maxId && $minId) {
$link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next",<'.$baseUrl.'min_id='.$minId.'>; rel="prev"';
}
$headers = isset($link) ? ['Link' => $link] : [];
return $this->json($res->toArray(), 200, $headers);
} }
/** /**