Use rawContent for Special Options to avoid a protected options() method

[friendica.git] / src / Model / APContact.php

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index a4c97f6232f672c9030449bff3c83136fe4ee20a..b519655e13bbe97e57377a5e12ae3505957bac40 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,12 +22,13 @@
 namespace Friendica\Model;
 
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 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;
@@ -54,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');
@@ -104,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 [];
                }
 
@@ -164,8 +180,12 @@ class APContact
                }
 
                if (Network::isLocalLink($url) && ($local_uid = User::getIdForURL($url))) {
-                       $data  = Transmitter::getProfile($local_uid);
-                       $local_owner = User::getOwnerDataById($local_uid);
+                       try {
+                               $data = Transmitter::getProfile($local_uid);
+                               $local_owner = User::getOwnerDataById($local_uid);
+                       } catch(HTTPException\NotFoundException $e) {
+                               $data = null;
+                       }
                }
 
                if (empty($data)) {
@@ -220,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');
@@ -284,7 +316,7 @@ class APContact
                                $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;
@@ -300,7 +332,7 @@ class APContact
                                $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;
@@ -316,6 +348,11 @@ class APContact
                                $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'];
                        }
                }