nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5855 from annando/ap-avatar

Browse source 
AP: Avoid an empty avatar field
This commit is contained in:
Hypolite Petovan 2018-10-08 00:06:41 -04:00 committed by GitHub
parent 3bccaccede 4047952703
commit 4472cf2289
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Protocol/ActivityPub/Transmitter.php
View file

@ -209,12 +209,17 @@ class Transmitter
return []; return [];
} }
$fields = ['name', 'url', 'location', 'about', 'avatar']; $fields = ['name', 'url', 'location', 'about', 'avatar', 'photo'];
$contact = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]); $contact = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
return []; return [];
} }
// On old installations and never changed contacts this might not be filled
if (empty($contact['avatar'])) {
$contact['avatar'] = $contact['photo'];
}
$data = ['@context' => ActivityPub::CONTEXT]; $data = ['@context' => ActivityPub::CONTEXT];
$data['id'] = $contact['url']; $data['id'] = $contact['url'];
$data['diaspora:guid'] = $user['guid']; $data['diaspora:guid'] = $user['guid'];