chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

Update PublicApiController

Browse source
This commit is contained in:
Daniel Supernault 2019-02-24 23:50:39 -07:00
parent eb7651e8ef
commit 9ca18f6b0d
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -252,8 +252,7 @@ class PublicApiController extends Controller
'local', 'local',
'created_at', 'created_at',
'updated_at' 'updated_at'
) )->whereIn('type', ['photo', 'photo:album', 'video', 'video:album'])
->whereHas('media')
->whereLocal(true) ->whereLocal(true)
->whereNull('uri') ->whereNull('uri')
->where('id', $dir, $id) ->where('id', $dir, $id)
@ -280,7 +279,7 @@ class PublicApiController extends Controller
'local', 'local',
'created_at', 'created_at',
'updated_at' 'updated_at'
)->whereHas('media') )->whereIn('type', ['photo', 'photo:album', 'video', 'video:album'])
->whereLocal(true) ->whereLocal(true)
->whereNull('uri') ->whereNull('uri')
->whereNotIn('profile_id', $filtered) ->whereNotIn('profile_id', $filtered)
@ -354,8 +353,7 @@ class PublicApiController extends Controller
'local', 'local',
'created_at', 'created_at',
'updated_at' 'updated_at'
) )->whereIn('type', ['photo', 'photo:album', 'video', 'video:album'])
->whereHas('media')
->whereLocal(true) ->whereLocal(true)
->whereNull('uri') ->whereNull('uri')
->where('id', $dir, $id) ->where('id', $dir, $id)
@ -383,7 +381,7 @@ class PublicApiController extends Controller
'local', 'local',
'created_at', 'created_at',
'updated_at' 'updated_at'
)->whereHas('media') )->whereIn('type', ['photo', 'photo:album', 'video', 'video:album'])
->whereLocal(true) ->whereLocal(true)
->whereNull('uri') ->whereNull('uri')
->whereIn('profile_id', $following) ->whereIn('profile_id', $following)