mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Update StatusService, cast response to array

This commit is contained in:
Daniel Supernault 2020-12-27 17:54:55 -07:00
parent 8e85728994
commit 0fbde91e87
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Api/BaseApiController.php
View File

@ -133,6 +133,7 @@ class BaseApiController extends Controller
$statuses = $account->statuses()->getQuery();
if($only_media == true) {
$statuses = $statuses
->whereIn('scope', ['public','unlisted'])
->whereHas('media')
->whereNull('in_reply_to_id')
->whereNull('reblog_of_id');

2
app/Http/Controllers/StatusController.php
View File

@ -33,7 +33,7 @@ class StatusController extends Controller
$status = Status::whereProfileId($user->id)
->whereNull('reblog_of_id')
->whereNotIn('visibility',['draft','direct'])
->whereIn('scope', ['public','unlisted'])
->findOrFail($id);
if($status->uri || $status->url) {

4
app/Services/StatusService.php
View File

@ -17,12 +17,12 @@ class StatusService {
public static function get($id)
{
return json_decode(Redis::get(self::CACHE_KEY . $id) ?? self::coldGet($id));
return json_decode(Redis::get(self::CACHE_KEY . $id) ?? self::coldGet($id), true);
}
public static function coldGet($id)
{
$status = Status::findOrFail($id);
$status = Status::whereScope('public')->findOrFail($id);
$fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer());
$resource = new Fractal\Resource\Item($status, new StatusStatelessTransformer());