From 4cf58e153960ded7a9b0d753b1b17ff8c5c834a4 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 12 Aug 2018 21:25:55 -0600 Subject: [PATCH] Update Profile & Federation controllers, output proper AP content type --- app/Http/Controllers/FederationController.php | 4 ++-- app/Http/Controllers/ProfileController.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/FederationController.php b/app/Http/Controllers/FederationController.php index 8c2e1ce94..376cad616 100644 --- a/app/Http/Controllers/FederationController.php +++ b/app/Http/Controllers/FederationController.php @@ -118,7 +118,7 @@ class FederationController extends Controller { $this->validate($request, ['resource'=>'required|string|min:3|max:255']); - $hash = hash('sha512', $request->input('resource')); + $hash = hash('sha256', $request->input('resource')); $webfinger = Cache::remember('api:webfinger:'.$hash, 1440, function() use($request) { $resource = $request->input('resource'); @@ -141,7 +141,7 @@ class FederationController extends Controller $fractal = new Fractal\Manager(); $resource = new Fractal\Resource\Item($user, new ProfileOutbox); $res = $fractal->createData($resource)->toArray(); - return response()->json($res['data']); + return response(json_encode($res['data']))->header('Content-Type', 'application/activity+json'); } public function userInbox(Request $request, $username) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index cfc589ba1..f56d65880 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -68,7 +68,7 @@ class ProfileController extends Controller $fractal = new Fractal\Manager(); $resource = new Fractal\Resource\Item($user, new ProfileTransformer); $res = $fractal->createData($resource)->toArray(); - return response()->json($res['data']); + return response(json_encode($res['data']))->header('Content-Type', 'application/activity+json'); } public function showAtomFeed(Request $request, $user)