UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-19 13:01:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #838 from pixelfed/frontend-ui-refactor

Browse source 
Update PublicApiController
This commit is contained in:
daniel 2019-02-13 18:17:36 -07:00 committed by GitHub
commit 41567d5aaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/Http/Controllers/PublicApiController.php
View file

@ -236,7 +236,22 @@ class PublicApiController extends Controller
if($min || $max) { if($min || $max) {
$dir = $min ? '>' : '<'; $dir = $min ? '>' : '<';
$id = $min ?? $max; $id = $min ?? $max;
$timeline = Status::whereHas('media') $timeline = Status::select(
'id',
'uri',
'caption',
'rendered',
'profile_id',
'type',
'in_reply_to_id',
'reblog_of_id',
'is_nsfw',
'scope',
'local',
'created_at',
'updated_at'
)
->whereHas('media')
->whereLocal(true) ->whereLocal(true)
->whereNull('uri') ->whereNull('uri')
->where('id', $dir, $id) ->where('id', $dir, $id)
@ -302,7 +317,22 @@ class PublicApiController extends Controller
if($min || $max) { if($min || $max) {
$dir = $min ? '>' : '<'; $dir = $min ? '>' : '<';
$id = $min ?? $max; $id = $min ?? $max;
$timeline = Status::whereHas('media') $timeline = Status::select(
'id',
'uri',
'caption',
'rendered',
'profile_id',
'type',
'in_reply_to_id',
'reblog_of_id',
'is_nsfw',
'scope',
'local',
'created_at',
'updated_at'
)
->whereHas('media')
->whereLocal(true) ->whereLocal(true)
->whereNull('uri') ->whereNull('uri')
->where('id', $dir, $id) ->where('id', $dir, $id)