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

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

Update PublicApiController
This commit is contained in:
daniel 2019-02-24 23:29:03 -07:00 committed by GitHub
parent dc3e41e92b 41525e07d8
commit 199ebc147e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/Http/Controllers/PublicApiController.php
View File

@ -266,7 +266,21 @@ class PublicApiController extends Controller
->limit($limit) ->limit($limit)
->get(); ->get();
} else { } else {
$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')
->whereNotIn('profile_id', $filtered) ->whereNotIn('profile_id', $filtered)
@ -355,7 +369,21 @@ class PublicApiController extends Controller
->limit($limit) ->limit($limit)
->get(); ->get();
} else { } else {
$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')
->whereIn('profile_id', $following) ->whereIn('profile_id', $following)