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

Update ApiV1Controller

Browse source
This commit is contained in:
Daniel Supernault 2023-02-06 05:39:36 -07:00
parent 2881b6626a
commit fab0c9cca9
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -2008,9 +2008,7 @@ class ApiV1Controller extends Controller
'created_at', 'created_at',
'updated_at' 'updated_at'
) )
->when($includeReplies, function($q, $includeReplies) { ->when(!$includeReplies, function($q, $includeReplies) {
return $q;
}, function($q, $includeReplies) {
return $q->whereNull('in_reply_to_id'); return $q->whereNull('in_reply_to_id');
}) })
->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album']) ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
@ -2064,9 +2062,7 @@ class ApiV1Controller extends Controller
) )
->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album']) ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
->where('id', $dir, $id) ->where('id', $dir, $id)
->when($includeReplies, function($q, $includeReplies) { ->when(!$includeReplies, function($q, $includeReplies) {
return $q;
}, function($q, $includeReplies) {
return $q->whereNull('in_reply_to_id'); return $q->whereNull('in_reply_to_id');
}) })
->whereIn('profile_id', $following) ->whereIn('profile_id', $following)
@ -2099,6 +2095,9 @@ class ApiV1Controller extends Controller
'visibility', 'visibility',
'created_at' 'created_at'
) )
->when(!$includeReplies, function($q, $includeReplies) {
return $q->whereNull('in_reply_to_id');
})
->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album']) ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
->whereIn('profile_id', $following) ->whereIn('profile_id', $following)
->whereIn('visibility',['public', 'unlisted', 'private']) ->whereIn('visibility',['public', 'unlisted', 'private'])
@ -2977,7 +2976,7 @@ class ApiV1Controller extends Controller
$id = $min_id ?? $max_id; $id = $min_id ?? $max_id;
$bookmarks = Bookmark::whereProfileId($pid) $bookmarks = Bookmark::whereProfileId($pid)
->when($id, function($id, $query) use($dir) { ->when($id, function($query, $id) use($dir) {
return $query->where('status_id', $dir, $id); return $query->where('status_id', $dir, $id);
}) })
->limit($limit) ->limit($limit)