X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FAPContact.php;h=7ce47bb227ec04e39804680947228533ac696328;hb=7b7132971a64a92a685a5fd860fe4709dce1765a;hp=cfbfa683cff030005dddd3e4c1a207769210188f;hpb=e0b936e334da98b5094227a7ce2dab6d41abe1ec;p=friendica.git diff --git a/src/Model/APContact.php b/src/Model/APContact.php index cfbfa683cf..7ce47bb227 100644 --- a/src/Model/APContact.php +++ b/src/Model/APContact.php @@ -1,23 +1,37 @@ . + * */ namespace Friendica\Model; -use Friendica\BaseObject; use Friendica\Content\Text\HTML; use Friendica\Core\Logger; -use Friendica\Core\Config; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Protocol\ActivityPub; use Friendica\Util\Network; use Friendica\Util\JsonLD; use Friendica\Util\DateTimeFormat; use Friendica\Util\Strings; -class APContact extends BaseObject +class APContact { /** * Resolves the profile url from the address by using webfinger @@ -34,7 +48,7 @@ class APContact extends BaseObject return false; } - $xrd_timeout = Config::get('system', 'xrd_timeout'); + $xrd_timeout = DI::config()->get('system', 'xrd_timeout'); $webfinger = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr); @@ -84,9 +98,11 @@ class APContact extends BaseObject public static function getByURL($url, $update = null) { if (empty($url)) { - return false; + return []; } + $fetched_contact = false; + if (empty($update)) { if (is_null($update)) { $ref_update = DateTimeFormat::utc('now - 1 month'); @@ -108,26 +124,30 @@ class APContact extends BaseObject } if (!is_null($update)) { - return DBA::isResult($apcontact) ? $apcontact : false; + return DBA::isResult($apcontact) ? $apcontact : []; + } + + if (DBA::isResult($apcontact)) { + $fetched_contact = $apcontact; } } if (empty(parse_url($url, PHP_URL_SCHEME))) { $url = self::addrToUrl($url); if (empty($url)) { - return false; + return $fetched_contact; } } $data = ActivityPub::fetchContent($url); if (empty($data)) { - return false; + return $fetched_contact; } $compacted = JsonLD::compact($data); if (empty($compacted['@id'])) { - return false; + return $fetched_contact; } $apcontact = []; @@ -147,7 +167,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'])) { @@ -168,19 +188,25 @@ class APContact extends BaseObject // Quit if none of the basic values are set if (empty($apcontact['url']) || empty($apcontact['inbox']) || empty($apcontact['type'])) { - return false; + return $fetched_contact; } // Quit if this doesn't seem to be an account at all if (!in_array($apcontact['type'], ActivityPub::ACCOUNT_TYPES)) { - return false; + return $fetched_contact; } $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'] = ''; + } + + $apcontact['pubkey'] = null; if (!empty($compacted['w3id:publicKey'])) { $apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted['w3id:publicKey'], 'w3id:publicKeyPem', '@value')); } @@ -192,6 +218,33 @@ class APContact extends BaseObject $apcontact['generator'] = JsonLD::fetchElement($compacted['as:generator'], 'as:name', '@value'); } + if (!empty($apcontact['following'])) { + $data = ActivityPub::fetchContent($apcontact['following']); + if (!empty($data)) { + if (!empty($data['totalItems'])) { + $apcontact['following_count'] = $data['totalItems']; + } + } + } + + if (!empty($apcontact['followers'])) { + $data = ActivityPub::fetchContent($apcontact['followers']); + if (!empty($data)) { + if (!empty($data['totalItems'])) { + $apcontact['followers_count'] = $data['totalItems']; + } + } + } + + if (!empty($apcontact['outbox'])) { + $data = ActivityPub::fetchContent($apcontact['outbox']); + if (!empty($data)) { + if (!empty($data['totalItems'])) { + $apcontact['statuses_count'] = $data['totalItems']; + } + } + } + // To-Do // Unhandled @@ -231,44 +284,6 @@ class APContact extends BaseObject DBA::delete('apcontact', ['url' => $url]); } - // Update some data in the contact table with various ways to catch them all - $contact_fields = ['name' => $apcontact['name'], 'about' => $apcontact['about'], 'alias' => $apcontact['alias']]; - - // Fetch the type and match it with the contact type - $contact_types = array_keys(ActivityPub::ACCOUNT_TYPES, $apcontact['type']); - if (!empty($contact_types)) { - $contact_type = array_pop($contact_types); - if (is_int($contact_type)) { - $contact_fields['contact-type'] = $contact_type; - - if ($contact_fields['contact-type'] != User::ACCOUNT_TYPE_COMMUNITY) { - // Resetting the 'forum' and 'prv' field when it isn't a forum - $contact_fields['forum'] = false; - $contact_fields['prv'] = false; - } else { - // Otherwise set the corresponding forum type - $contact_fields['forum'] = !$apcontact['manually-approve']; - $contact_fields['prv'] = $apcontact['manually-approve']; - } - } - } - - DBA::update('contact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]); - - if (!empty($apcontact['photo'])) { - $contacts = DBA::select('contact', ['uid', 'id'], ['nurl' => Strings::normaliseLink($url)]); - while ($contact = DBA::fetch($contacts)) { - Contact::updateAvatar($apcontact['photo'], $contact['uid'], $contact['id']); - } - DBA::close($contacts); - } - - // Update the gcontact table - // These two fields don't exist in the gcontact table - unset($contact_fields['forum']); - unset($contact_fields['prv']); - DBA::update('gcontact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]); - Logger::log('Updated profile for ' . $url, Logger::DEBUG); return $apcontact;