X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FAPContact.php;h=a919a67f30e740c88d1e2e13b7d5bd73be34a9ae;hb=235eab0d99891eb1d0bf401856dfb162c6f1ea20;hp=e9500f85b89c585dd301a0e54ee3db6f3a54c5c1;hpb=d8bf9c4601988216eb95d7a24288a440434454b0;p=friendica.git diff --git a/src/Model/APContact.php b/src/Model/APContact.php index e9500f85b8..a919a67f30 100644 --- a/src/Model/APContact.php +++ b/src/Model/APContact.php @@ -28,14 +28,17 @@ use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Database\DBStructure; use Friendica\DI; +use Friendica\Network\HTTPException; use Friendica\Network\Probe; use Friendica\Protocol\ActivityNamespace; use Friendica\Protocol\ActivityPub; +use Friendica\Protocol\ActivityPub\Transmitter; use Friendica\Util\Crypto; use Friendica\Util\DateTimeFormat; use Friendica\Util\HTTPSignature; use Friendica\Util\JsonLD; use Friendica\Util\Network; +use Friendica\Util\Strings; class APContact { @@ -52,6 +55,20 @@ class APContact return []; } + if (Contact::isLocal($addr) && ($local_uid = User::getIdForURL($addr)) && ($local_owner = User::getOwnerDataById($local_uid))) { + $data = [ + 'addr' => $local_owner['addr'], + 'baseurl' => $local_owner['baseurl'], + 'url' => $local_owner['url'], + 'subscribe' => $local_owner['baseurl'] . '/follow?url={uri}']; + + if (!empty($local_owner['alias']) && ($local_owner['url'] != $local_owner['alias'])) { + $data['alias'] = $local_owner['alias']; + } + + return $data; + } + $data = ['addr' => $addr]; $template = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr); $webfinger = Probe::webfinger(str_replace('{uri}', urlencode($addr), $template), 'application/jrd+json'); @@ -102,7 +119,8 @@ class APContact */ public static function getByURL($url, $update = null) { - if (empty($url)) { + if (empty($url) || Network::isUrlBlocked($url)) { + Logger::info('Domain is blocked', ['url' => $url]); return []; } @@ -161,22 +179,35 @@ class APContact DI::cache()->set($cachekey, System::callstack(20), Duration::FIVE_MINUTES); } - $curlResult = HTTPSignature::fetchRaw($url); - $failed = empty($curlResult) || empty($curlResult->getBody()) || - (!$curlResult->isSuccess() && ($curlResult->getReturnCode() != 410)); - - if (!$failed) { - $data = json_decode($curlResult->getBody(), true); - $failed = empty($data) || !is_array($data); + if (Network::isLocalLink($url) && ($local_uid = User::getIdForURL($url))) { + try { + $data = Transmitter::getProfile($local_uid); + $local_owner = User::getOwnerDataById($local_uid); + } catch(HTTPException\NotFoundException $e) { + $data = null; + } } - if (!$failed && ($curlResult->getReturnCode() == 410)) { - $data = ['@context' => ActivityPub::CONTEXT, 'id' => $url, 'type' => 'Tombstone']; - } + if (empty($data)) { + $local_owner = []; - if ($failed) { - self::markForArchival($fetched_contact ?: []); - return $fetched_contact; + $curlResult = HTTPSignature::fetchRaw($url); + $failed = empty($curlResult) || empty($curlResult->getBody()) || + (!$curlResult->isSuccess() && ($curlResult->getReturnCode() != 410)); + + if (!$failed) { + $data = json_decode($curlResult->getBody(), true); + $failed = empty($data) || !is_array($data); + } + + if (!$failed && ($curlResult->getReturnCode() == 410)) { + $data = ['@context' => ActivityPub::CONTEXT, 'id' => $url, 'type' => 'Tombstone']; + } + + if ($failed) { + self::markForArchival($fetched_contact ?: []); + return $fetched_contact; + } } $compacted = JsonLD::compact($data); @@ -209,6 +240,18 @@ class APContact $apcontact['about'] = HTML::toBBCode(JsonLD::fetchElement($compacted, 'as:summary', '@value')); + $ims = JsonLD::fetchElementArray($compacted, 'vcard:hasInstantMessage'); + if (!empty($ims)) { + foreach ($ims as $link) { + if (substr($link, 0, 5) == 'xmpp:') { + $apcontact['xmpp'] = substr($link, 5); + } + if (substr($link, 0, 7) == 'matrix:') { + $apcontact['matrix'] = substr($link, 7); + } + } + } + $apcontact['photo'] = JsonLD::fetchElement($compacted, 'as:icon', '@id'); if (is_array($apcontact['photo']) || !empty($compacted['as:icon']['as:url']['@id'])) { $apcontact['photo'] = JsonLD::fetchElement($compacted['as:icon'], 'as:url', '@id'); @@ -267,9 +310,13 @@ class APContact } if (!empty($apcontact['following'])) { - $following = ActivityPub::fetchContent($apcontact['following']); + if (!empty($local_owner)) { + $following = ActivityPub\Transmitter::getContacts($local_owner, [Contact::SHARING, Contact::FRIEND], 'following'); + } else { + $following = ActivityPub::fetchContent($apcontact['following']); + } if (!empty($following['totalItems'])) { - // Mastodon seriously allows for this condition? + // Mastodon seriously allows for this condition? // Jul 14 2021 - See https://mastodon.social/@BLUW for a negative following count if ($following['totalItems'] < 0) { $following['totalItems'] = 0; @@ -279,9 +326,13 @@ class APContact } if (!empty($apcontact['followers'])) { - $followers = ActivityPub::fetchContent($apcontact['followers']); + if (!empty($local_owner)) { + $followers = ActivityPub\Transmitter::getContacts($local_owner, [Contact::FOLLOWER, Contact::FRIEND], 'followers'); + } else { + $followers = ActivityPub::fetchContent($apcontact['followers']); + } if (!empty($followers['totalItems'])) { - // Mastodon seriously allows for this condition? + // Mastodon seriously allows for this condition? // Jul 14 2021 - See https://mastodon.online/@goes11 for a negative followers count if ($followers['totalItems'] < 0) { $followers['totalItems'] = 0; @@ -291,8 +342,17 @@ class APContact } if (!empty($apcontact['outbox'])) { - $outbox = ActivityPub::fetchContent($apcontact['outbox']); + if (!empty($local_owner)) { + $outbox = ActivityPub\Transmitter::getOutbox($local_owner); + } else { + $outbox = ActivityPub::fetchContent($apcontact['outbox']); + } if (!empty($outbox['totalItems'])) { + // Mastodon seriously allows for this condition? + // Jul 20 2021 - See https://chaos.social/@m11 for a negative posts count + if ($outbox['totalItems'] < 0) { + $outbox['totalItems'] = 0; + } $apcontact['statuses_count'] = $outbox['totalItems']; } }