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

Support for empty nick names

Browse source
This commit is contained in:
Michael 2019-07-24 19:30:36 +00:00
parent 9ba7f4689a
commit e256876ec1
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); 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'); $apcontact['name'] = JsonLD::fetchElement($compacted, 'as:name', '@value');
if (empty($apcontact['name'])) { if (empty($apcontact['name'])) {
@ -185,7 +185,12 @@ class APContact extends BaseObject
$parts = parse_url($apcontact['url']); $parts = parse_url($apcontact['url']);
unset($parts['scheme']); unset($parts['scheme']);
unset($parts['path']); 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'])) { if (!empty($compacted['w3id:publicKey'])) {
$apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted['w3id:publicKey'], 'w3id:publicKeyPem', '@value')); $apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted['w3id:publicKey'], 'w3id:publicKeyPem', '@value'));