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

Update CollectionService

Browse source
This commit is contained in:
Daniel Supernault 2022-09-30 23:48:11 -06:00
parent ab2d1315a0
commit c40b2f091f
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/Services/CollectionService.php
View file

@ -79,17 +79,23 @@ class CollectionService
return [ return [
'id' => (string) $collection->id, 'id' => (string) $collection->id,
'pid' => (string) $collection->profile_id, 'pid' => (string) $collection->profile_id,
'username' => $account['username'],
'visibility' => $collection->visibility, 'visibility' => $collection->visibility,
'title' => $collection->title, 'title' => $collection->title,
'description' => $collection->description, 'description' => $collection->description,
'thumb' => '/storage/no-preview.png', 'thumb' => url('/storage/no-preview.png'),
'url' => $collection->url(), 'url' => $collection->url(),
'published_at' => $collection->published_at 'updated_at' => $collection->updated_at,
'published_at' => $collection->published_at,
]; ];
}); });
if($collection) { if($collection) {
$account = AccountService::get($collection['pid']);
if(!$account) {
return false;
}
$collection['avatar'] = $account['avatar'];
$collection['username'] = $account['username'];
$collection['thumb'] = self::getThumb($id); $collection['thumb'] = self::getThumb($id);
$collection['post_count'] = self::count($id); $collection['post_count'] = self::count($id);
} }
@ -106,12 +112,12 @@ class CollectionService
$res = [ $res = [
'id' => (string) $collection->id, 'id' => (string) $collection->id,
'pid' => (string) $collection->profile_id, 'pid' => (string) $collection->profile_id,
'username' => $account['username'],
'visibility' => $collection->visibility, 'visibility' => $collection->visibility,
'title' => $collection->title, 'title' => $collection->title,
'description' => $collection->description, 'description' => $collection->description,
'thumb' => self::getThumb($id), 'thumb' => self::getThumb($id),
'url' => $collection->url(), 'url' => $collection->url(),
'updated_at' => $collection->updated_at,
'published_at' => $collection->published_at 'published_at' => $collection->published_at
]; ];
Cache::put(self::CACHE_KEY . 'get:' . $id, $res, 86400); Cache::put(self::CACHE_KEY . 'get:' . $id, $res, 86400);
@ -129,15 +135,15 @@ class CollectionService
{ {
$item = self::getItems($id, 0, 1); $item = self::getItems($id, 0, 1);
if(!$item || empty($item)) { if(!$item || empty($item)) {
return '/storage/no-preview.png'; return url('/storage/no-preview.png');
} }
$status = StatusService::get($item[0]); $status = StatusService::get($item[0]);
if(!$status) { if(!$status) {
return '/storage/no-preview.png'; return url('/storage/no-preview.png');
} }
if(!isset($status['media_attachments']) || empty($status['media_attachments'])) { if(!isset($status['media_attachments']) || empty($status['media_attachments'])) {
return '/storage/no-preview.png'; return url('/storage/no-preview.png');
} }
return $status['media_attachments'][0]['url']; return $status['media_attachments'][0]['url'];