Browse Source

Update ApiV1Controller, improve local/remote logic in public timeline endpoint

Daniel Supernault 3 years ago
parent
commit
4ff179ad4d
1 changed files with 3 additions and 2 deletions
  1. 3 2
      app/Http/Controllers/Api/ApiV1Controller.php

+ 3 - 2
app/Http/Controllers/Api/ApiV1Controller.php

@@ -1973,14 +1973,15 @@ class ApiV1Controller extends Controller
 		  'min_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
 		  'min_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
 		  'max_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
 		  'max_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
 		  'limit'       => 'nullable|integer|max:100',
 		  'limit'       => 'nullable|integer|max:100',
-		  'remote'		=> 'sometimes'
+		  'remote'		=> 'sometimes',
+		  'local'		=> 'sometimes'
 		]);
 		]);
 
 
 		$min = $request->input('min_id');
 		$min = $request->input('min_id');
 		$max = $request->input('max_id');
 		$max = $request->input('max_id');
 		$limit = $request->input('limit') ?? 20;
 		$limit = $request->input('limit') ?? 20;
 		$user = $request->user();
 		$user = $request->user();
-		$remote = $request->has('remote');
+		$remote = ($request->has('remote') && $request->input('remote') == true) || ($request->filled('local') && $request->input('local') != true);
         $filtered = $user ? UserFilterService::filters($user->profile_id) : [];
         $filtered = $user ? UserFilterService::filters($user->profile_id) : [];
 
 
         if($remote && config('instance.timeline.network.cached')) {
         if($remote && config('instance.timeline.network.cached')) {