Add avatar to AP profile

This commit is contained in:
Daniel Supernault 2018-08-13 19:31:18 -06:00
parent a842c54f22
commit c14314d70f
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 8 additions and 13 deletions

View file

@ -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);
}

View file

@ -41,7 +41,11 @@ class ProfileTransformer extends Fractal\TransformerAbstract
'endpoints' => [
'sharedInbox' => config('routes.api.sharedInbox')
],
'icon' => [
'type' => 'Image',
'mediaType' => 'image/jpeg',
'url' => $profile->avatarUrl()
]
];
}