UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-29 09:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update ApiV1Controller, fix hashtag timeline

Browse source
This commit is contained in:
Daniel Supernault 2023-05-08 22:50:49 -06:00
parent 43d3aa2b94
commit fc1a385cfd
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3270,6 +3270,16 @@ class ApiV1Controller extends Controller
$max = $request->input('max_id'); $max = $request->input('max_id');
$limit = $request->input('limit', 20); $limit = $request->input('limit', 20);
if($min || $max) {
$minMax = SnowflakeService::byDate(now()->subMonths(6));
if($min && intval($min) < $minMax) {
return [];
}
if($max && intval($max) < $minMax) {
return [];
}
}
if(!$min && !$max) { if(!$min && !$max) {
$id = 1; $id = 1;
$dir = '>'; $dir = '>';
@ -3279,15 +3289,13 @@ class ApiV1Controller extends Controller
} }
$res = StatusHashtag::whereHashtagId($tag->id) $res = StatusHashtag::whereHashtagId($tag->id)
->whereStatusVisibility('public')
->where('status_id', $dir, $id) ->where('status_id', $dir, $id)
->latest() ->whereStatusVisibility('public')
->orderBy('status_id', 'desc')
->limit($limit) ->limit($limit)
->pluck('status_id') ->pluck('status_id')
->map(function ($i) { ->map(function ($i) {
if($i) {
return StatusService::getMastodon($i); return StatusService::getMastodon($i);
}
}) })
->filter(function($i) { ->filter(function($i) {
return $i && isset($i['account']); return $i && isset($i['account']);