UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-25 06:23:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update PublicApiController, fix network timeline bug

Browse source
This commit is contained in:
Daniel Supernault 2019-04-08 20:42:14 -06:00
parent cb202c9671
commit a0349ec828
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -449,9 +449,12 @@ class PublicApiController extends Controller
'is_nsfw', 'is_nsfw',
'scope', 'scope',
'local', 'local',
'reply_count',
'comments_disabled',
'created_at', 'created_at',
'updated_at' 'updated_at'
)->where('id', $dir, $id) )->where('id', $dir, $id)
->whereIn('type', ['photo', 'photo:album', 'video', 'video:album'])
->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')
@ -472,6 +475,8 @@ class PublicApiController extends Controller
'is_nsfw', 'is_nsfw',
'scope', 'scope',
'local', 'local',
'reply_count',
'comments_disabled',
'created_at', 'created_at',
'updated_at' 'updated_at'
)->whereIn('type', ['photo', 'photo:album', 'video', 'video:album']) )->whereIn('type', ['photo', 'photo:album', 'video', 'video:album'])