UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-10 08:44:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1093 from pixelfed/frontend-ui-refactor

Browse source 
Update FederationController
This commit is contained in:
daniel 2019-03-28 18:27:59 -06:00 committed by GitHub
commit ac53aea288
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/FederationController.php
View file

@ -66,7 +66,7 @@ class FederationController extends Controller
RemoteFollowPipeline::dispatch($follower, $url); RemoteFollowPipeline::dispatch($follower, $url);
return redirect()->back(); return response(['success' => true, 'follower' => $follower]);
} }
public function nodeinfoWellKnown() public function nodeinfoWellKnown()
@ -124,7 +124,6 @@ class FederationController extends Controller
], ],
'captcha' => (bool) config('pixelfed.recaptcha'), 'captcha' => (bool) config('pixelfed.recaptcha'),
], ],
'openRegistrations' => config('pixelfed.open_registration'),
'protocols' => [ 'protocols' => [
'activitypub', 'activitypub',
], ],
@ -148,7 +147,7 @@ class FederationController extends Controller
'version' => '2.0', 'version' => '2.0',
]; ];
}); });
$res['openRegistrations'] = config('pixelfed.open_registration');
return response()->json($res, 200, [ return response()->json($res, 200, [
'Access-Control-Allow-Origin' => '*' 'Access-Control-Allow-Origin' => '*'
]); ]);