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

Update PublicApiController

This commit is contained in:
Daniel Supernault 2019-01-10 12:25:25 -07:00
parent 2eba39d317
commit fa53e34e45
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,6 +233,8 @@ class PublicApiController extends Controller
$dir = $min ? '>' : '<';
$id = $min ?? $max;
$timeline = Status::whereHas('media')
->whereLocal(true)
->whereNull('uri')
->where('id', $dir, $id)
->whereNotIn('profile_id', $filtered)
->whereNull('in_reply_to_id')
@ -244,6 +246,8 @@ class PublicApiController extends Controller
->get();
} else {
$timeline = Status::whereHas('media')
->whereLocal(true)
->whereNull('uri')
->whereNotIn('profile_id', $filtered)
->whereNull('in_reply_to_id')
->whereNull('reblog_of_id')
@ -295,6 +299,8 @@ class PublicApiController extends Controller
$dir = $min ? '>' : '<';
$id = $min ?? $max;
$timeline = Status::whereHas('media')
->whereLocal(true)
->whereNull('uri')
->where('id', $dir, $id)
->whereIn('profile_id', $following)
->whereNotIn('profile_id', $filtered)
@ -307,6 +313,8 @@ class PublicApiController extends Controller
->get();
} else {
$timeline = Status::whereHas('media')
->whereLocal(true)
->whereNull('uri')
->whereIn('profile_id', $following)
->whereNotIn('profile_id', $filtered)
->whereNull('in_reply_to_id')