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

Merge pull request #2445 from pixelfed/staging

Browse source 
Update InternalApiController
This commit is contained in:
daniel 2020-11-21 19:59:25 -07:00 committed by GitHub
commit f58e9b6be6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Controllers/InternalApiController.php
View file

@ -80,18 +80,25 @@ class InternalApiController extends Controller
}); });
$following = array_merge($following, $filters); $following = array_merge($following, $filters);
$sql = config('database.default') !== 'pgsql';
$posts = Status::select( $posts = Status::select(
'id', 'id',
'caption', 'caption',
'is_nsfw',
'profile_id', 'profile_id',
'type' 'type',
'uri',
'created_at'
) )
->whereNull('uri') ->whereNull('uri')
->whereIn('type', ['photo','photo:album', 'video']) ->whereIn('type', ['photo','photo:album', 'video'])
->whereIsNsfw(false) ->whereIsNsfw(false)
->whereVisibility('public') ->whereVisibility('public')
->whereNotIn('profile_id', $following) ->whereNotIn('profile_id', $following)
->whereDate('created_at', '>', now()->subMonths(3)) ->when($sql, function($q, $s) {
return $q->where('created_at', '>', now()->subMonths(3));
})
->with('media') ->with('media')
->inRandomOrder() ->inRandomOrder()
->latest() ->latest()