Merge pull request #3345 from pixelfed/staging

Staging

app/Http/Controllers/PlaceController.php

@@ -10,6 +10,11 @@ use App\{
 
 class PlaceController extends Controller
 {
+	public function __construct()
+	{
+		$this->middleware('auth');
+	}
+
     public function show(Request $request, $id, $slug)
     {
     	$place = Place::whereSlug($slug)->findOrFail($id);

app/Http/Controllers/PublicApiController.php

@@ -293,8 +293,8 @@ class PublicApiController extends Controller
           'limit'       => 'nullable|integer|max:30'
         ]);
 
-        if(config('instance.timeline.local.is_public') == false && !Auth::check()) {
-            abort(403, 'Authentication required.');
+        if(!$request->user()) {
+            return response('', 403);
         }
 
         $page = $request->input('page');
@@ -422,8 +422,8 @@ class PublicApiController extends Controller
 
     public function homeTimelineApi(Request $request)
     {
-        if(!Auth::check()) {
-            return abort(403);
+        if(!$request->user()) {
+            return response('', 403);
         }
 
         $this->validate($request,[
@@ -586,7 +586,10 @@ class PublicApiController extends Controller
 
     public function networkTimelineApi(Request $request)
     {
-        abort_if(!Auth::check(), 403);
+        if(!$request->user()) {
+            return response('', 403);
+        }
+
         abort_if(config('federation.network_timeline') == false, 404);
 
         $this->validate($request,[

public/js/vendor.js.LICENSE.txt

@@ -106,7 +106,7 @@
  */
 
 /*!
- * vue-i18n v8.27.0 
+ * vue-i18n v8.27.1 
  * (c) 2022 kazuya kawaguchi
  * Released under the MIT License.
  */