UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-22 21:13:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update ApiV1Controller, fix bookmarks endpoint

Browse source
This commit is contained in:
Daniel Supernault 2023-01-27 00:53:47 -07:00
parent e4e7b5062a
commit f0e648b7b8
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2935,24 +2935,20 @@ class ApiV1Controller extends Controller
$dir = $min_id ? '>' : '<';
$id = $min_id ?? $max_id;
if($id) {
$bookmarks = Bookmark::whereProfileId($pid)
->where('status_id', $dir, $id)
->limit($limit)
->pluck('status_id');
} else {
$bookmarks = Bookmark::whereProfileId($pid)
->latest()
->limit($limit)
->pluck('status_id');
}
$bookmarks = Bookmark::whereProfileId($pid)
->when($id, function($id, $query) use($dir) {
return $query->where('status_id', $dir, $id);
})
->limit($limit)
->pluck('status_id')
->map(function($id) {
return \App\Services\StatusService::getMastodon($id);
})
->filter()
->values()
->toArray();
$res = [];
foreach($bookmarks as $id) {
$res[] = \App\Services\StatusService::getMastodon($id);
}
return $this->json($res);
return $this->json($bookmarks);
}
/**