Merge pull request #13580 from annando/fetch-async

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

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index dc062fe5b506afd222a92f7b4f8c75f70d413a0b..ff151e469e119b579e9edc1442eeabe0818b88ac 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -119,6 +119,11 @@ class APContact
                        return [];
                }
 
+               if (!Network::isValidHttpUrl($url) && !filter_var($url, FILTER_VALIDATE_EMAIL)) {
+                       Logger::info('Invalid URL', ['url' => $url]);
+                       return [];
+               }
+
                $fetched_contact = [];
 
                if (empty($update)) {
@@ -152,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'])) {
@@ -168,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;
                        }
@@ -192,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);
@@ -579,6 +587,14 @@ class APContact
         */
        public static function isRelay(array $apcontact): bool
        {
+               if (in_array($apcontact['type'], ['Person', 'Organization'])) {
+                       return false;
+               }
+
+               if (($apcontact['type'] == 'Service') && empty($apcontact['outbox']) && empty($apcontact['sharedinbox']) && empty($apcontact['following']) && empty($apcontact['followers']) && empty($apcontact['statuses_count'])) {
+                       return true;
+               }
+
                if (empty($apcontact['nick']) || $apcontact['nick'] != 'relay') {
                        return false;
                }