Update ApiV1Controller, fix public timeline scope, properly support b…

…oth local + remote parameters
pixelfed · Mar 5, 2024 · d6eac65 · d6eac65
1 parent 6cb1484
commit d6eac65
Showing 1 changed file with 35 additions and 3 deletions.
diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php
@@ -2634,8 +2634,8 @@ public function timelinePublic(Request $request)
         }
         $user = $request->user();
 
-        $remote = $request->has('remote');
-        $local = $request->has('local');
+        $remote = $request->has('remote') && $request->boolean('remote');
+        $local = $request->boolean('local');
         $userRoleKey = $remote ? 'can-view-network-feed' : 'can-view-public-feed';
         if ($user->has_roles && ! UserRoleService::can($userRoleKey, $user->id)) {
             return [];
@@ -2646,7 +2646,36 @@ public function timelinePublic(Request $request)
         $hideNsfw = config('instance.hide_nsfw_on_public_feeds');
         $amin = SnowflakeService::byDate(now()->subDays(config('federation.network_timeline_days_falloff')));
 
-        if ($remote) {
+        if ($local && $remote) {
+            $feed = Status::select(
+                'id',
+                'uri',
+                'type',
+                'scope',
+                'created_at',
+                'profile_id',
+                'in_reply_to_id',
+                'reblog_of_id'
+            )
+                ->when($minOrMax, function ($q, $minOrMax) use ($min, $max) {
+                    $dir = $min ? '>' : '<';
+                    $id = $min ?? $max;
+
+                    return $q->where('id', $dir, $id);
+                })
+                ->whereNull(['in_reply_to_id', 'reblog_of_id'])
+                ->when($hideNsfw, function ($q, $hideNsfw) {
+                    return $q->where('is_nsfw', false);
+                })
+                ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
+                ->whereScope('public')
+                ->where('id', '>', $amin)
+                ->orderByDesc('id')
+                ->limit(($limit * 2))
+                ->pluck('id')
+                ->values()
+                ->toArray();
+        } elseif ($remote && ! $local) {
             if (config('instance.timeline.network.cached')) {
                 Cache::remember('api:v1:timelines:network:cache_check', 10368000, function () {
                     if (NetworkTimelineService::count() == 0) {
@@ -2799,6 +2828,9 @@ public function timelinePublic(Request $request)
         if ($remote) {
             $baseUrl .= 'remote=1&';
         }
+        if ($local) {
+            $baseUrl .= 'local=1&';
+        }
         $minId = $res->map(function ($s) {
             return ['id' => $s['id']];
         })->min('id');