UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-22 21:13:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Update Profile & Federation controllers, output proper AP content type
This commit is contained in:
daniel 2018-08-12 21:27:01 -06:00 committed by GitHub
commit 49e29ecd2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -118,7 +118,7 @@ class FederationController extends Controller
{ {
$this->validate($request, ['resource'=>'required|string|min:3|max:255']); $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) { $webfinger = Cache::remember('api:webfinger:'.$hash, 1440, function() use($request) {
$resource = $request->input('resource'); $resource = $request->input('resource');
@ -141,7 +141,7 @@ class FederationController extends Controller
$fractal = new Fractal\Manager(); $fractal = new Fractal\Manager();
$resource = new Fractal\Resource\Item($user, new ProfileOutbox); $resource = new Fractal\Resource\Item($user, new ProfileOutbox);
$res = $fractal->createData($resource)->toArray(); $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) public function userInbox(Request $request, $username)

2
app/Http/Controllers/ProfileController.php
View file

@ -68,7 +68,7 @@ class ProfileController extends Controller
$fractal = new Fractal\Manager(); $fractal = new Fractal\Manager();
$resource = new Fractal\Resource\Item($user, new ProfileTransformer); $resource = new Fractal\Resource\Item($user, new ProfileTransformer);
$res = $fractal->createData($resource)->toArray(); $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) public function showAtomFeed(Request $request, $user)