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

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

Update PublicApiController
This commit is contained in:
daniel 2019-02-24 23:51:15 -07:00 committed by GitHub
parent 3627f90807 9ca18f6b0d
commit 458d9de6b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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)