UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-11 22:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update StatusService, cast response to array

Browse source
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(); $statuses = $account->statuses()->getQuery();
if($only_media == true) { if($only_media == true) {
$statuses = $statuses $statuses = $statuses
->whereIn('scope', ['public','unlisted'])
->whereHas('media') ->whereHas('media')
->whereNull('in_reply_to_id') ->whereNull('in_reply_to_id')
->whereNull('reblog_of_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) $status = Status::whereProfileId($user->id)
->whereNull('reblog_of_id') ->whereNull('reblog_of_id')
->whereNotIn('visibility',['draft','direct']) ->whereIn('scope', ['public','unlisted'])
->findOrFail($id); ->findOrFail($id);
if($status->uri || $status->url) { if($status->uri || $status->url) {

4
app/Services/StatusService.php
View file

@ -17,12 +17,12 @@ class StatusService {
public static function get($id) 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) public static function coldGet($id)
{ {
$status = Status::findOrFail($id); $status = Status::whereScope('public')->findOrFail($id);
$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());