fediport/pixelfed
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update StatusTransformers, add liked_by attribute

Browse source
This commit is contained in:
Daniel Supernault 2021-05-01 16:06:39 -06:00
parent ea68724054
commit 372bacb01b
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 133 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
app/Transformer/Api/StatusStatelessTransformer.php
View file

@ -6,74 +6,79 @@ use App\Status;
use League\Fractal; use League\Fractal;
use Cache; use Cache;
use App\Services\HashidService; use App\Services\HashidService;
use App\Services\LikeService;
use App\Services\MediaTagService; use App\Services\MediaTagService;
use App\Services\StatusLabelService;
use App\Services\ProfileService;
class StatusStatelessTransformer extends Fractal\TransformerAbstract class StatusStatelessTransformer extends Fractal\TransformerAbstract
{ {
protected $defaultIncludes = [ protected $defaultIncludes = [
'account', 'account',
'media_attachments', 'media_attachments',
]; ];
public function transform(Status $status) public function transform(Status $status)
{ {
$taggedPeople = MediaTagService::get($status->id); $taggedPeople = MediaTagService::get($status->id);
return [ return [
'_v' => 1, '_v' => 1,
'id' => (string) $status->id, 'id' => (string) $status->id,
'shortcode' => HashidService::encode($status->id), 'shortcode' => HashidService::encode($status->id),
'uri' => $status->url(), 'uri' => $status->url(),
'url' => $status->url(), 'url' => $status->url(),
'in_reply_to_id' => $status->in_reply_to_id, 'in_reply_to_id' => $status->in_reply_to_id,
'in_reply_to_account_id' => $status->in_reply_to_profile_id, 'in_reply_to_account_id' => $status->in_reply_to_profile_id,
'reblog' => null, 'reblog' => null,
'content' => $status->rendered ?? $status->caption, 'content' => $status->rendered ?? $status->caption,
'content_text' => $status->caption, 'content_text' => $status->caption,
'created_at' => $status->created_at->format('c'), 'created_at' => $status->created_at->format('c'),
'emojis' => [], 'emojis' => [],
'reblogs_count' => $status->reblogs_count ?? 0, 'reblogs_count' => 0,
'favourites_count' => $status->likes_count ?? 0, 'favourites_count' => 0,
'reblogged' => null, 'reblogged' => null,
'favourited' => null, 'favourited' => null,
'muted' => null, 'muted' => null,
'sensitive' => (bool) $status->is_nsfw, 'sensitive' => (bool) $status->is_nsfw,
'spoiler_text' => $status->cw_summary ?? '', 'spoiler_text' => $status->cw_summary ?? '',
'visibility' => $status->visibility ?? $status->scope, 'visibility' => $status->visibility ?? $status->scope,
'application' => [ 'application' => [
'name' => 'web', 'name' => 'web',
'website' => null 'website' => null
], ],
'language' => null, 'language' => null,
'pinned' => null, 'pinned' => null,
'mentions' => [], 'mentions' => [],
'tags' => [], 'tags' => [],
'pf_type' => $status->type ?? $status->setType(), 'pf_type' => $status->type ?? $status->setType(),
'reply_count' => (int) $status->reply_count, 'reply_count' => (int) $status->reply_count,
'comments_disabled' => $status->comments_disabled ? true : false, 'comments_disabled' => $status->comments_disabled ? true : false,
'thread' => false, 'thread' => false,
'replies' => [], 'replies' => [],
'parent' => [], 'parent' => [],
'place' => $status->place, 'place' => $status->place,
'local' => (bool) $status->local, 'local' => (bool) $status->local,
'taggedPeople' => $taggedPeople 'taggedPeople' => $taggedPeople,
]; 'label' => StatusLabelService::get($status),
} 'liked_by' => LikeService::likedBy($status)
];
}
public function includeAccount(Status $status) public function includeAccount(Status $status)
{ {
$account = $status->profile; $account = $status->profile;
return $this->item($account, new AccountTransformer()); return $this->item($account, new AccountTransformer());
} }
public function includeMediaAttachments(Status $status) public function includeMediaAttachments(Status $status)
{ {
return Cache::remember('status:transformer:media:attachments:'.$status->id, now()->addMinutes(3), function() use($status) { return Cache::remember('status:transformer:media:attachments:'.$status->id, now()->addMinutes(3), function() use($status) {
if(in_array($status->type, ['photo', 'video', 'video:album', 'photo:album', 'loop', 'photo:video:album'])) { if(in_array($status->type, ['photo', 'video', 'video:album', 'photo:album', 'loop', 'photo:video:album'])) {
$media = $status->media()->orderBy('order')->get(); $media = $status->media()->orderBy('order')->get();
return $this->collection($media, new MediaTransformer()); return $this->collection($media, new MediaTransformer());
} }
}); });
} }
} }

130
app/Transformer/Api/StatusTransformer.php
View file

@ -2,81 +2,85 @@
namespace App\Transformer\Api; namespace App\Transformer\Api;
use App\Like;
use App\Status; use App\Status;
use League\Fractal; use League\Fractal;
use Cache; use Cache;
use App\Services\HashidService; use App\Services\HashidService;
use App\Services\LikeService;
use App\Services\MediaTagService; use App\Services\MediaTagService;
use App\Services\StatusLabelService; use App\Services\StatusLabelService;
use App\Services\ProfileService;
use Illuminate\Support\Str; use Illuminate\Support\Str;
class StatusTransformer extends Fractal\TransformerAbstract class StatusTransformer extends Fractal\TransformerAbstract
{ {
protected $defaultIncludes = [ protected $defaultIncludes = [
'account', 'account',
'media_attachments', 'media_attachments',
]; ];
public function transform(Status $status) public function transform(Status $status)
{ {
$taggedPeople = MediaTagService::get($status->id); $taggedPeople = MediaTagService::get($status->id);
return [
'_v' => 1,
'id' => (string) $status->id,
'shortcode' => HashidService::encode($status->id),
'uri' => $status->url(),
'url' => $status->url(),
'in_reply_to_id' => (string) $status->in_reply_to_id,
'in_reply_to_account_id' => (string) $status->in_reply_to_profile_id,
'reblog' => null,
'content' => $status->rendered ?? $status->caption,
'content_text' => $status->caption,
'created_at' => $status->created_at->format('c'),
'emojis' => [],
'reblogs_count' => $status->reblogs_count ?? 0,
'favourites_count' => $status->likes_count ?? 0,
'reblogged' => $status->shared(),
'favourited' => $status->liked(),
'muted' => null,
'sensitive' => (bool) $status->is_nsfw,
'spoiler_text' => $status->cw_summary ?? '',
'visibility' => $status->visibility ?? $status->scope,
'application' => [
'name' => 'web',
'website' => null
],
'language' => null,
'pinned' => null,
'mentions' => [],
'tags' => [],
'pf_type' => $status->type ?? $status->setType(),
'reply_count' => (int) $status->reply_count,
'comments_disabled' => $status->comments_disabled ? true : false,
'thread' => false,
'replies' => [],
'parent' => [],
'place' => $status->place,
'local' => (bool) $status->local,
'taggedPeople' => $taggedPeople,
'label' => StatusLabelService::get($status)
];
}
public function includeAccount(Status $status) return [
{ '_v' => 1,
$account = $status->profile; 'id' => (string) $status->id,
'shortcode' => HashidService::encode($status->id),
'uri' => $status->url(),
'url' => $status->url(),
'in_reply_to_id' => (string) $status->in_reply_to_id,
'in_reply_to_account_id' => (string) $status->in_reply_to_profile_id,
'reblog' => null,
'content' => $status->rendered ?? $status->caption,
'content_text' => $status->caption,
'created_at' => $status->created_at->format('c'),
'emojis' => [],
'reblogs_count' => 0,
'favourites_count' => 0,
'reblogged' => $status->shared(),
'favourited' => $status->liked(),
'muted' => null,
'sensitive' => (bool) $status->is_nsfw,
'spoiler_text' => $status->cw_summary ?? '',
'visibility' => $status->visibility ?? $status->scope,
'application' => [
'name' => 'web',
'website' => null
],
'language' => null,
'pinned' => null,
'mentions' => [],
'tags' => [],
'pf_type' => $status->type ?? $status->setType(),
'reply_count' => (int) $status->reply_count,
'comments_disabled' => $status->comments_disabled ? true : false,
'thread' => false,
'replies' => [],
'parent' => [],
'place' => $status->place,
'local' => (bool) $status->local,
'taggedPeople' => $taggedPeople,
'label' => StatusLabelService::get($status),
'liked_by' => LikeService::likedBy($status)
];
}
return $this->item($account, new AccountTransformer()); public function includeAccount(Status $status)
} {
$account = $status->profile;
public function includeMediaAttachments(Status $status) return $this->item($account, new AccountTransformer());
{ }
return Cache::remember('status:transformer:media:attachments:'.$status->id, now()->addMinutes(14), function() use($status) {
if(in_array($status->type, ['photo', 'video', 'video:album', 'photo:album', 'loop', 'photo:video:album'])) { public function includeMediaAttachments(Status $status)
$media = $status->media()->orderBy('order')->get(); {
return $this->collection($media, new MediaTransformer()); return Cache::remember('status:transformer:media:attachments:'.$status->id, now()->addMinutes(14), function() use($status) {
} if(in_array($status->type, ['photo', 'video', 'video:album', 'photo:album', 'loop', 'photo:video:album'])) {
}); $media = $status->media()->orderBy('order')->get();
} return $this->collection($media, new MediaTransformer());
}
});
}
} }