diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 258e1a38b..985df88ed 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -20,14 +20,10 @@ class ProfileController extends Controller $user = Profile::whereUsername($username)->firstOrFail(); $settings = User::whereUsername($username)->firstOrFail()->settings; - $mimes = [ - 'application/activity+json', - 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' - ]; - - if(str_contains($request->header('accept'), $mimes) && config('pixelfed.activitypub_enabled')) { + if($request->wantsJson() && config('pixelfed.activitypub_enabled')) { return $this->showActivityPub($request, $user); } + if($user->is_private == true) { $can_access = $this->privateProfileCheck($user); if($can_access !== true) { @@ -53,12 +49,7 @@ class ProfileController extends Controller $user = Profile::whereUsername($username)->firstOrFail(); $settings = User::whereUsername($username)->firstOrFail()->settings; - $mimes = [ - 'application/activity+json', - 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' - ]; - - if(str_contains($request->header('accept'), $mimes) && config('pixelfed.activitypub_enabled')) { + if($request->wantsJson() && config('pixelfed.activitypub_enabled')) { return $this->showActivityPub($request, $user); } diff --git a/app/Transformer/ActivityPub/ProfileTransformer.php b/app/Transformer/ActivityPub/ProfileTransformer.php index 286a74b41..c3ee00638 100644 --- a/app/Transformer/ActivityPub/ProfileTransformer.php +++ b/app/Transformer/ActivityPub/ProfileTransformer.php @@ -41,7 +41,11 @@ class ProfileTransformer extends Fractal\TransformerAbstract 'endpoints' => [ 'sharedInbox' => config('routes.api.sharedInbox') ], - + 'icon' => [ + 'type' => 'Image', + 'mediaType' => 'image/jpeg', + 'url' => $profile->avatarUrl() + ] ]; }