1
0
Эх сурвалжийг харах

Merge pull request #3345 from pixelfed/staging

Staging
daniel 3 жил өмнө
parent
commit
282e4c48ea
48 өөрчлөгдсөн 14 нэмэгдсэн , 6 устгасан
  1. 5 0
      app/Http/Controllers/PlaceController.php
  2. 8 5
      app/Http/Controllers/PublicApiController.php
  3. BIN
      public/css/app.css
  4. BIN
      public/css/appdark.css
  5. BIN
      public/css/landing.css
  6. BIN
      public/js/admin.js
  7. BIN
      public/js/app.js
  8. BIN
      public/js/collections.js
  9. BIN
      public/js/components.js
  10. BIN
      public/js/compose-classic.js
  11. BIN
      public/js/compose-m9we36ik.js
  12. BIN
      public/js/compose-xl3w8bxy.js
  13. BIN
      public/js/compose.js
  14. BIN
      public/js/daci-m9we36ik.js
  15. BIN
      public/js/daci-xl3w8bxy.js
  16. BIN
      public/js/developers.js
  17. BIN
      public/js/dffc-m9we36ik.js
  18. BIN
      public/js/dffc-xl3w8bxy.js
  19. BIN
      public/js/direct.js
  20. BIN
      public/js/dmyh-m9we36ik.js
  21. BIN
      public/js/dmyh-xl3w8bxy.js
  22. BIN
      public/js/dmym-m9we36ik.js
  23. BIN
      public/js/dmym-xl3w8bxy.js
  24. BIN
      public/js/dsfc-m9we36ik.js
  25. BIN
      public/js/dsfc-xl3w8bxy.js
  26. BIN
      public/js/dssc-m9we36ik.js
  27. BIN
      public/js/dssc-xl3w8bxy.js
  28. BIN
      public/js/hashtag.js
  29. BIN
      public/js/home-m9we36ik.js
  30. BIN
      public/js/home-xl3w8bxy.js
  31. BIN
      public/js/loops.js
  32. BIN
      public/js/manifest.js
  33. BIN
      public/js/post-m9we36ik.js
  34. BIN
      public/js/post-xl3w8bxy.js
  35. BIN
      public/js/profile-m9we36ik.js
  36. BIN
      public/js/profile-xl3w8bxy.js
  37. BIN
      public/js/profile.js
  38. BIN
      public/js/rempos.js
  39. BIN
      public/js/rempro.js
  40. BIN
      public/js/search.js
  41. BIN
      public/js/spa.js
  42. BIN
      public/js/status.js
  43. BIN
      public/js/stories.js
  44. BIN
      public/js/story-compose.js
  45. BIN
      public/js/timeline.js
  46. BIN
      public/js/vendor.js
  47. 1 1
      public/js/vendor.js.LICENSE.txt
  48. BIN
      public/mix-manifest.json

+ 5 - 0
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);

+ 8 - 5
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,[

BIN
public/css/app.css


BIN
public/css/appdark.css


BIN
public/css/landing.css


BIN
public/js/admin.js


BIN
public/js/app.js


BIN
public/js/collections.js


BIN
public/js/components.js


BIN
public/js/compose-classic.js


BIN
public/js/compose-m9we36ik.js


BIN
public/js/compose-xl3w8bxy.js


BIN
public/js/compose.js


BIN
public/js/daci-m9we36ik.js


BIN
public/js/daci-xl3w8bxy.js


BIN
public/js/developers.js


BIN
public/js/dffc-m9we36ik.js


BIN
public/js/dffc-xl3w8bxy.js


BIN
public/js/direct.js


BIN
public/js/dmyh-m9we36ik.js


BIN
public/js/dmyh-xl3w8bxy.js


BIN
public/js/dmym-m9we36ik.js


BIN
public/js/dmym-xl3w8bxy.js


BIN
public/js/dsfc-m9we36ik.js


BIN
public/js/dsfc-xl3w8bxy.js


BIN
public/js/dssc-m9we36ik.js


BIN
public/js/dssc-xl3w8bxy.js


BIN
public/js/hashtag.js


BIN
public/js/home-m9we36ik.js


BIN
public/js/home-xl3w8bxy.js


BIN
public/js/loops.js


BIN
public/js/manifest.js


BIN
public/js/post-m9we36ik.js


BIN
public/js/post-xl3w8bxy.js


BIN
public/js/profile-m9we36ik.js


BIN
public/js/profile-xl3w8bxy.js


BIN
public/js/profile.js


BIN
public/js/rempos.js


BIN
public/js/rempro.js


BIN
public/js/search.js


BIN
public/js/spa.js


BIN
public/js/status.js


BIN
public/js/stories.js


BIN
public/js/story-compose.js


BIN
public/js/timeline.js


BIN
public/js/vendor.js


+ 1 - 1
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.
  */

BIN
public/mix-manifest.json