Преглед на файлове

Update FederationController

Prevent outbox from returning an actor object so other federation
software does not attempt to send inbox requests until the inbox is
fully supported.
Daniel Supernault преди 7 години
родител
ревизия
51aa17052f
променени са 3 файла, в които са добавени 9 реда и са изтрити 2 реда
  1. 4 1
      app/Http/Controllers/FederationController.php
  2. 1 1
      app/Http/Controllers/ProfileController.php
  3. 4 0
      config/pixelfed.php

+ 4 - 1
app/Http/Controllers/FederationController.php

@@ -123,8 +123,11 @@ class FederationController extends Controller
 
     public function userOutbox(Request $request, $username)
     {
+      if(config('pixelfed.activitypub_enabled') == false) {
+        abort(403);
+      }
+      
       $user = Profile::whereNull('remote_url')->whereUsername($username)->firstOrFail();
-
       $timeline = $user->statuses()->orderBy('created_at','desc')->paginate(10);
       $fractal = new Fractal\Manager();
       $resource = new Fractal\Resource\Item($user, new ProfileOutbox);

+ 1 - 1
app/Http/Controllers/ProfileController.php

@@ -25,7 +25,7 @@ class ProfileController extends Controller
         'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
       ];
 
-      if(in_array($request->header('accept'), $mimes)) {
+      if(in_array($request->header('accept'), $mimes) && config('pixelfed.activitypub_enabled')) {
         return $this->showActivityPub($request, $user);
       }
 

+ 4 - 0
config/pixelfed.php

@@ -71,5 +71,9 @@ return [
     |
     */
     'open_registration' => env('OPEN_REGISTRATION', true),
+
+    'remote_follow_enabled' => env('REMOTE_FOLLOW', false),
+
+    'activitypub_enabled' => env('ACTIVITY_PUB', false),
     
 ];