UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-29 09:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update StatusService, hydrate accounts on request instead of caching them along with status objects

Browse source
This commit is contained in:
Daniel Supernault 2023-09-17 23:54:31 -06:00
parent 2496386d9b
commit 223661ecb2
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/Services/StatusService.php
View file

@ -22,9 +22,9 @@ class StatusService
return self::CACHE_KEY . $p . $id; return self::CACHE_KEY . $p . $id;
} }
public static function get($id, $publicOnly = true) public static function get($id, $publicOnly = true, $mastodonMode = false)
{ {
return Cache::remember(self::key($id, $publicOnly), 21600, function() use($id, $publicOnly) { $res = Cache::remember(self::key($id, $publicOnly), 21600, function() use($id, $publicOnly) {
if($publicOnly) { if($publicOnly) {
$status = Status::whereScope('public')->find($id); $status = Status::whereScope('public')->find($id);
} else { } else {
@ -36,13 +36,23 @@ class StatusService
$fractal = new Fractal\Manager(); $fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer()); $fractal->setSerializer(new ArraySerializer());
$resource = new Fractal\Resource\Item($status, new StatusStatelessTransformer()); $resource = new Fractal\Resource\Item($status, new StatusStatelessTransformer());
return $fractal->createData($resource)->toArray(); $res = $fractal->createData($resource)->toArray();
$res['_pid'] = isset($res['account']) && isset($res['account']['id']) ? $res['account']['id'] : null;
if(isset($res['_pid'])) {
unset($res['account']);
}
return $res;
}); });
if($res) {
$res['account'] = $mastodonMode === true ? AccountService::getMastodon($res['_pid'], true) : AccountService::get($res['_pid'], true);
unset($res['_pid']);
}
return $res;
} }
public static function getMastodon($id, $publicOnly = true) public static function getMastodon($id, $publicOnly = true)
{ {
$status = self::get($id, $publicOnly); $status = self::get($id, $publicOnly, true);
if(!$status) { if(!$status) {
return null; return null;
} }