Fix uddate issues and improve speed when displaying contact posts

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

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index c49017b595b120d3730e3d885417a7d4fedc4e27..c77e20818685c7110552b556d99ffc730abde7b5 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -157,7 +157,10 @@ class APContact
 
                $apcontact = [];
 
-               $webfinger = empty(parse_url($url, PHP_URL_SCHEME));
+               // Mastodon profile short-form URL https://domain.tld/@user doesn't return AP data when queried
+               // with HTTPSignature::fetchRaw, but returns the correct data when provided to WebFinger
+               // @see https://github.com/friendica/friendica/issues/13359
+               $webfinger = empty(parse_url($url, PHP_URL_SCHEME)) || strpos($url, '@') !== false;
                if ($webfinger) {
                        $apcontact = self::fetchWebfingerData($url);
                        if (empty($apcontact['url'])) {
@@ -173,7 +176,7 @@ class APContact
                $cachekey = 'apcontact:' . ItemURI::getIdByURI($url);
                $result = DI::cache()->get($cachekey);
                if (!is_null($result)) {
-                       Logger::info('Multiple requests for the address', ['url' => $url, 'update' => $update, 'callstack' => System::callstack(20), 'result' => $result]);
+                       Logger::info('Multiple requests for the address', ['url' => $url, 'update' => $update, 'result' => $result]);
                        if (!empty($fetched_contact)) {
                                return $fetched_contact;
                        }
@@ -197,7 +200,7 @@ class APContact
                                $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);
@@ -325,7 +328,7 @@ class APContact
                        if (!empty($local_owner)) {
                                $following = ActivityPub\Transmitter::getContacts($local_owner, [Contact::SHARING, Contact::FRIEND], 'following');
                        } else {
-                               $following = ActivityPub::fetchContent($apcontact['following']);
+                               $following = HTTPSignature::fetch($apcontact['following']);
                        }
                        if (!empty($following['totalItems'])) {
                                // Mastodon seriously allows for this condition?
@@ -341,7 +344,7 @@ class APContact
                        if (!empty($local_owner)) {
                                $followers = ActivityPub\Transmitter::getContacts($local_owner, [Contact::FOLLOWER, Contact::FRIEND], 'followers');
                        } else {
-                               $followers = ActivityPub::fetchContent($apcontact['followers']);
+                               $followers = HTTPSignature::fetch($apcontact['followers']);
                        }
                        if (!empty($followers['totalItems'])) {
                                // Mastodon seriously allows for this condition?
@@ -357,7 +360,7 @@ class APContact
                        if (!empty($local_owner)) {
                                $statuses_count = self::getStatusesCount($local_owner);
                        } else {
-                               $outbox = ActivityPub::fetchContent($apcontact['outbox']);
+                               $outbox = HTTPSignature::fetch($apcontact['outbox']);
                                $statuses_count = $outbox['totalItems'] ?? 0;
                        }
                        if (!empty($statuses_count)) {
@@ -385,11 +388,11 @@ class APContact
                if (strlen($apcontact['photo'] ?? '') > 255) {
                        $parts = parse_url($apcontact['photo']);
                        unset($parts['fragment']);
-                       $apcontact['photo'] = (string)Uri::fromParts($parts);
+                       $apcontact['photo'] = (string)Uri::fromParts((array)$parts);
 
                        if (strlen($apcontact['photo']) > 255) {
                                unset($parts['query']);
-                               $apcontact['photo'] = (string)Uri::fromParts($parts);
+                               $apcontact['photo'] = (string)Uri::fromParts((array)$parts);
                        }
 
                        if (strlen($apcontact['photo']) > 255) {
@@ -584,23 +587,20 @@ class APContact
         */
        public static function isRelay(array $apcontact): bool
        {
-               if (in_array($apcontact['type'], ['Person', 'Organization'])) {
+               if (!in_array($apcontact['type'] ?? '', ['Application', 'Group', 'Service'])) {
                        return false;
                }
 
-               if (($apcontact['type'] == 'Service') && empty($apcontact['outbox']) && empty($apcontact['sharedinbox']) && empty($apcontact['following']) && empty($apcontact['followers']) && empty($apcontact['statuses_count'])) {
+               $path = parse_url($apcontact['url'], PHP_URL_PATH);
+               if (($apcontact['type'] == 'Group') && !empty($apcontact['followers']) && ($apcontact['nick'] == 'relay') && ($path == '/actor')) {
                        return true;
                }
 
-               if (empty($apcontact['nick']) || $apcontact['nick'] != 'relay') {
-                       return false;
-               }
-
-               if (!empty($apcontact['type']) && $apcontact['type'] == 'Application') {
+               if (in_array($apcontact['type'], ['Application', 'Service']) && empty($apcontact['following']) && empty($apcontact['followers'])) {
                        return true;
                }
 
-               if (!empty($apcontact['type']) && in_array($apcontact['type'], ['Group', 'Service']) && is_null($apcontact['outbox'])) {
+               if (($apcontact['type'] == 'Application') && ($apcontact['nick'] == 'relay') && in_array($path, ['/actor', '/relay'])) {
                        return true;
                }