UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-12 17:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Add avatar to AP profile
This commit is contained in:
daniel 2018-08-13 19:32:18 -06:00 committed by GitHub
commit b9e7848849
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,14 +20,10 @@ class ProfileController extends Controller
$user = Profile::whereUsername($username)->firstOrFail(); $user = Profile::whereUsername($username)->firstOrFail();
$settings = User::whereUsername($username)->firstOrFail()->settings; $settings = User::whereUsername($username)->firstOrFail()->settings;
$mimes = [ if($request->wantsJson() && config('pixelfed.activitypub_enabled')) {
'application/activity+json',
'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
];
if(str_contains($request->header('accept'), $mimes) && config('pixelfed.activitypub_enabled')) {
return $this->showActivityPub($request, $user); return $this->showActivityPub($request, $user);
} }
if($user->is_private == true) { if($user->is_private == true) {
$can_access = $this->privateProfileCheck($user); $can_access = $this->privateProfileCheck($user);
if($can_access !== true) { if($can_access !== true) {
@ -53,12 +49,7 @@ class ProfileController extends Controller
$user = Profile::whereUsername($username)->firstOrFail(); $user = Profile::whereUsername($username)->firstOrFail();
$settings = User::whereUsername($username)->firstOrFail()->settings; $settings = User::whereUsername($username)->firstOrFail()->settings;
$mimes = [ if($request->wantsJson() && config('pixelfed.activitypub_enabled')) {
'application/activity+json',
'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
];
if(str_contains($request->header('accept'), $mimes) && config('pixelfed.activitypub_enabled')) {
return $this->showActivityPub($request, $user); return $this->showActivityPub($request, $user);
} }

6
app/Transformer/ActivityPub/ProfileTransformer.php
View file

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