From 217922466a649058de013154abbfafa514330351 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 2 Feb 2022 17:55:29 -0700 Subject: [PATCH 1/2] Update InstanceActorController, fix content-type header --- app/Http/Controllers/InstanceActorController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/InstanceActorController.php b/app/Http/Controllers/InstanceActorController.php index 52d8a5cc6..0eb796732 100644 --- a/app/Http/Controllers/InstanceActorController.php +++ b/app/Http/Controllers/InstanceActorController.php @@ -14,7 +14,7 @@ class InstanceActorController extends Controller $res = (new InstanceActor())->first()->getActor(); return json_encode($res, JSON_UNESCAPED_SLASHES); }); - return response($res)->header('Content-Type', 'application/json'); + return response($res)->header('Content-Type', 'application/activity+json'); } public function inbox() @@ -24,14 +24,14 @@ class InstanceActorController extends Controller public function outbox() { - $res = [ + $res = json_encode([ '@context' => 'https://www.w3.org/ns/activitystreams', 'id' => config('app.url') . '/i/actor/outbox', 'type' => 'OrderedCollection', 'totalItems' => 0, 'first' => config('app.url') . '/i/actor/outbox?page=true', 'last' => config('app.url') . '/i/actor/outbox?min_id=0page=true' - ]; - return response()->json($res); + ], JSON_UNESCAPED_SLASHES); + return response($res)->header('Content-Type', 'application/activity+json'); } } From 22c5b37fc779bc78ae29d98a4e3e78592f15005d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 2 Feb 2022 17:56:34 -0700 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d36c6dde0..debdc7f47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Updated ApiV1Controller, fix private status replies returning 404. ([73226360](https://github.com/pixelfed/pixelfed/commit/73226360)) - Updated StatusService, use BookmarkService for bookmarked state. ([a7d71551](https://github.com/pixelfed/pixelfed/commit/a7d71551)) - Updated Apis, added ReblogService to improve reblogged state for api entities ([6cfd6be5](https://github.com/pixelfed/pixelfed/commit/6cfd6be5)) +- Updated InstanceActorController, fix content-type header. ([21792246](https://github.com/pixelfed/pixelfed/commit/21792246)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2)