mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-12-26 17:56:48 +00:00
Update PublicApiController, add LikeService to Network timeline
This commit is contained in:
parent
d3157f2a2d
commit
82895591c3
1 changed files with 12 additions and 7 deletions
|
@ -26,6 +26,7 @@ use App\Transformer\Api\{
|
||||||
};
|
};
|
||||||
use App\Services\{
|
use App\Services\{
|
||||||
AccountService,
|
AccountService,
|
||||||
|
LikeService,
|
||||||
PublicTimelineService,
|
PublicTimelineService,
|
||||||
StatusService,
|
StatusService,
|
||||||
SnowflakeService,
|
SnowflakeService,
|
||||||
|
@ -527,8 +528,10 @@ class PublicApiController extends Controller
|
||||||
->orderBy('created_at', 'desc')
|
->orderBy('created_at', 'desc')
|
||||||
->limit($limit)
|
->limit($limit)
|
||||||
->get()
|
->get()
|
||||||
->map(function($s) {
|
->map(function($s) use ($user) {
|
||||||
return StatusService::get($s->id);
|
$status = StatusService::get($s->id);
|
||||||
|
$status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
|
||||||
|
return $status;
|
||||||
});
|
});
|
||||||
$res = $timeline->toArray();
|
$res = $timeline->toArray();
|
||||||
} else {
|
} else {
|
||||||
|
@ -543,11 +546,13 @@ class PublicApiController extends Controller
|
||||||
->whereScope('public')
|
->whereScope('public')
|
||||||
->where('id', '>', $amin)
|
->where('id', '>', $amin)
|
||||||
->orderBy('created_at', 'desc')
|
->orderBy('created_at', 'desc')
|
||||||
->limit($limit)
|
->limit($limit)
|
||||||
->get()
|
->get()
|
||||||
->map(function($s) {
|
->map(function($s) use ($user) {
|
||||||
return StatusService::get($s->id);
|
$status = StatusService::get($s->id);
|
||||||
});
|
$status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
|
||||||
|
return $status;
|
||||||
|
});
|
||||||
$res = $timeline->toArray();
|
$res = $timeline->toArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue