mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-09 16:24:51 +00:00
Update ApiV1Controller, fix bookmarks endpoint
This commit is contained in:
parent
e4e7b5062a
commit
f0e648b7b8
1 changed files with 13 additions and 17 deletions
|
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue