Merge pull request #2445 from pixelfed/staging

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

View File

@ -80,18 +80,25 @@ class InternalApiController extends Controller
});
$following = array_merge($following, $filters);
$sql = config('database.default') !== 'pgsql';
$posts = Status::select(
'id',
'caption',
'is_nsfw',
'profile_id',
'type'
'type',
'uri',
'created_at'
)
->whereNull('uri')
->whereIn('type', ['photo','photo:album', 'video'])
->whereIsNsfw(false)
->whereVisibility('public')
->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')
->inRandomOrder()
->latest()