Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 04:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Database version 1499] Create new paradigm classes for Diaspora Contact

Browse source 
- Switch table fcontact for dcontact in views
This commit is contained in:
Hypolite Petovan 2021-09-15 00:36:01 -04:00
parent ace80ca1b4
commit ce69026964
14 changed files with 734 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/Network/Probe.php
View file

@ -110,7 +110,8 @@ class Probe
*/
private static function rearrangeData(array $data): array
{
$fields = ['name', 'nick', 'guid', 'url', 'addr', 'alias', 'photo', 'header',
$fields = ['name', 'given_name', 'family_name', 'nick', 'guid', 'url', 'addr', 'alias',
'photo', 'photo_medium', 'photo_small', 'header',
'account-type', 'community', 'keywords', 'location', 'about', 'xmpp', 'matrix',
'hide', 'batch', 'notify', 'poll', 'request', 'confirm', 'subscribe', 'poco',
'following', 'followers', 'inbox', 'outbox', 'sharedinbox',
@ -124,7 +125,7 @@ class Probe
if (in_array($field, $numeric_fields)) {
$newdata[$field] = (int)$data[$field];
} else {
$newdata[$field] = $data[$field];
$newdata[$field] = trim($data[$field]);
}
} elseif (!in_array($field, $numeric_fields)) {
$newdata[$field] = '';
@ -1290,9 +1291,19 @@ class Probe
$data['name'] = $search->item(0)->nodeValue;
}
$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' given_name ')]", $vcard); // */
if ($search->length > 0) {
$data["given_name"] = $search->item(0)->nodeValue;
}
$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' family_name ')]", $vcard); // */
if ($search->length > 0) {
$data["family_name"] = $search->item(0)->nodeValue;
}
$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' searchable ')]", $vcard); // */
if ($search->length > 0) {
$data['searchable'] = $search->item(0)->nodeValue;
$data['hide'] = (strtolower($search->item(0)->nodeValue) != 'true');
}
$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' key ')]", $vcard); // */
@ -1309,7 +1320,7 @@ class Probe
}
}
$avatar = [];
$avatars = [];
if (!empty($vcard)) {
$photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
foreach ($photos as $photo) {
@ -1319,20 +1330,27 @@ class Probe
}
if (isset($attr['src']) && isset($attr['width'])) {
$avatar[$attr['width']] = $attr['src'];
$avatars[$attr['width']] = self::fixAvatar($attr['src'], $data['baseurl']);
}
// We don't have a width. So we just take everything that we got.
// This is a Hubzilla workaround which doesn't send a width.
if ((sizeof($avatar) == 0) && !empty($attr['src'])) {
$avatar[] = $attr['src'];
if (!$avatars && !empty($attr['src'])) {
$avatars[] = self::fixAvatar($attr['src'], $data['baseurl']);
}
}
}
if (sizeof($avatar)) {
ksort($avatar);
$data['photo'] = self::fixAvatar(array_pop($avatar), $data['baseurl']);
if ($avatars) {
ksort($avatars);
$data['photo'] = array_pop($avatars);
if ($avatars) {
$data['photo_medium'] = array_pop($avatars);
}
if ($avatars) {
$data['photo_small'] = array_pop($avatars);
}
}
if ($dfrn) {
@ -1356,7 +1374,6 @@ class Probe
}
}
return $data;
}