forked from mirror/pixelfed
Merge pull request #2909 from pixelfed/staging
Update AccountService, fix status bug
This commit is contained in:
commit
687030090f
|
@ -25,7 +25,7 @@ class AccountService
|
||||||
return Cache::remember($key, $ttl, function() use($id) {
|
return Cache::remember($key, $ttl, function() use($id) {
|
||||||
$fractal = new Fractal\Manager();
|
$fractal = new Fractal\Manager();
|
||||||
$fractal->setSerializer(new ArraySerializer());
|
$fractal->setSerializer(new ArraySerializer());
|
||||||
$profile = Profile::whereNull('status')->findOrFail($id);
|
$profile = Profile::findOrFail($id);
|
||||||
$resource = new Fractal\Resource\Item($profile, new AccountTransformer());
|
$resource = new Fractal\Resource\Item($profile, new AccountTransformer());
|
||||||
return $fractal->createData($resource)->toArray();
|
return $fractal->createData($resource)->toArray();
|
||||||
});
|
});
|
||||||
|
|
|
@ -18,7 +18,7 @@ class StatusService {
|
||||||
|
|
||||||
public static function key($id, $publicOnly = true)
|
public static function key($id, $publicOnly = true)
|
||||||
{
|
{
|
||||||
$p = $publicOnly ? '' : 'all:';
|
$p = $publicOnly ? 'pub:' : 'all:';
|
||||||
return self::CACHE_KEY . $p . $id;
|
return self::CACHE_KEY . $p . $id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue