UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-10 08:44:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update StatusHashtagService, use StatusService for statuses

Browse source
This commit is contained in:
Daniel Supernault 2021-01-30 16:07:12 -07:00
parent 6e44ae0b64
commit 0355b567dd
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/Services/StatusHashtagService.php
View file

@ -16,6 +16,10 @@ class StatusHashtagService {
public static function get($id, $page = 1, $stop = 9) public static function get($id, $page = 1, $stop = 9)
{ {
if($page > 20) {
return [];
}
return StatusHashtag::whereHashtagId($id) return StatusHashtag::whereHashtagId($id)
->whereStatusVisibility('public') ->whereStatusVisibility('public')
->whereHas('media') ->whereHas('media')
@ -66,16 +70,6 @@ class StatusHashtagService {
public static function getStatus($statusId, $hashtagId) public static function getStatus($statusId, $hashtagId)
{ {
return Cache::remember('pf:services:status-hashtag:post:'.$statusId.':hashtag:'.$hashtagId, now()->addMonths(3), function() use($statusId, $hashtagId) { return ['status' => StatusService::get($statusId)];
$statusHashtag = StatusHashtag::with('profile', 'status', 'hashtag')
->whereStatusVisibility('public')
->whereStatusId($statusId)
->whereHashtagId($hashtagId)
->first();
$fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer());
$resource = new Fractal\Resource\Item($statusHashtag, new StatusHashtagTransformer());
return $fractal->createData($resource)->toArray();
});
} }
} }