Merge pull request #2445 from pixelfed/staging

Update InternalApiController
2024-11-22 22:41:27 +00:00 · 2020-11-21 19:59:25 -07:00 · 2020-11-21 19:59:25 -07:00 · f58e9b6be6
commit f58e9b6be6
parent 5af87c7298 f8dc33cc81
1 changed files with 9 additions and 2 deletions
--- a/app/Http/Controllers/InternalApiController.php
+++ b/app/Http/Controllers/InternalApiController.php
@ -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()