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

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

Browse source 
Update PublicApiController
This commit is contained in:
daniel 2019-01-10 12:36:19 -07:00 committed by GitHub
commit a5bfe660fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 ? '>' : '<'; $dir = $min ? '>' : '<';
$id = $min ?? $max; $id = $min ?? $max;
$timeline = Status::whereHas('media') $timeline = Status::whereHas('media')
->whereLocal(true)
->whereNull('uri')
->where('id', $dir, $id) ->where('id', $dir, $id)
->whereNotIn('profile_id', $filtered) ->whereNotIn('profile_id', $filtered)
->whereNull('in_reply_to_id') ->whereNull('in_reply_to_id')
@ -244,6 +246,8 @@ class PublicApiController extends Controller
->get(); ->get();
} else { } else {
$timeline = Status::whereHas('media') $timeline = Status::whereHas('media')
->whereLocal(true)
->whereNull('uri')
->whereNotIn('profile_id', $filtered) ->whereNotIn('profile_id', $filtered)
->whereNull('in_reply_to_id') ->whereNull('in_reply_to_id')
->whereNull('reblog_of_id') ->whereNull('reblog_of_id')
@ -295,6 +299,8 @@ class PublicApiController extends Controller
$dir = $min ? '>' : '<'; $dir = $min ? '>' : '<';
$id = $min ?? $max; $id = $min ?? $max;
$timeline = Status::whereHas('media') $timeline = Status::whereHas('media')
->whereLocal(true)
->whereNull('uri')
->where('id', $dir, $id) ->where('id', $dir, $id)
->whereIn('profile_id', $following) ->whereIn('profile_id', $following)
->whereNotIn('profile_id', $filtered) ->whereNotIn('profile_id', $filtered)
@ -307,6 +313,8 @@ class PublicApiController extends Controller
->get(); ->get();
} else { } else {
$timeline = Status::whereHas('media') $timeline = Status::whereHas('media')
->whereLocal(true)
->whereNull('uri')
->whereIn('profile_id', $following) ->whereIn('profile_id', $following)
->whereNotIn('profile_id', $filtered) ->whereNotIn('profile_id', $filtered)
->whereNull('in_reply_to_id') ->whereNull('in_reply_to_id')