Merge pull request #10860 from nupplaphil/feat/depository_profilefield

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

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 7bdde60c65ca31be4446c4009378bb1a9446d3f5..a919a67f30e740c88d1e2e13b7d5bd73be34a9ae 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -28,6 +28,7 @@ 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;
@@ -118,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 [];
                }
 
@@ -178,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)) {
@@ -234,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');
@@ -330,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'];
                        }
                }