friendica/friendica
6
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-15 20:09:27 +01:00
Code Issues Packages Projects Releases 2 Wiki Activity

Merge pull request #7429 from annando/empty-nick

Browse source 
Support for empty nick names
This commit is contained in:
Hypolite Petovan 2019-07-24 15:59:54 -04:00 committed by GitHub
parent 9ba7f4689a e256876ec1
commit 02aff71996
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Model/APContact.php
View file

@ -153,7 +153,7 @@ class APContact extends BaseObject
self::unarchiveInbox($apcontact['sharedinbox'], true);
}
$apcontact['nick'] = JsonLD::fetchElement($compacted, 'as:preferredUsername', '@value');
$apcontact['nick'] = JsonLD::fetchElement($compacted, 'as:preferredUsername', '@value') ?? '';
$apcontact['name'] = JsonLD::fetchElement($compacted, 'as:name', '@value');
if (empty($apcontact['name'])) {
@ -185,7 +185,12 @@ class APContact extends BaseObject
$parts = parse_url($apcontact['url']);
unset($parts['scheme']);
unset($parts['path']);
$apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
if (!empty($apcontact['nick'])) {
$apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
} else {
$apcontact['addr'] = '';
}
if (!empty($compacted['w3id:publicKey'])) {
$apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted['w3id:publicKey'], 'w3id:publicKeyPem', '@value'));