X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FAPContact.php;h=c77e20818685c7110552b556d99ffc730abde7b5;hb=f81192b4c3838480154301ac25cbbbed58593380;hp=215d7e317dcf4a78b973942c87e1b7acc4e07607;hpb=5bba6dd4b7fdb62250d89580ac95c34d45a0ddbb;p=friendica.git

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 215d7e317d..c77e208186 100644
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -29,7 +29,6 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
-use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPException;
 use Friendica\Network\Probe;
 use Friendica\Protocol\ActivityNamespace;
@@ -120,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)) {
@@ -153,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'])) {
@@ -169,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;
 			}
@@ -189,17 +196,22 @@ class APContact
 		if (empty($data)) {
 			$local_owner = [];
 
-			$curlResult = HTTPSignature::fetchRaw($url);
-			$failed = empty($curlResult) || empty($curlResult->getBody()) ||
-				(!$curlResult->isSuccess() && ($curlResult->getReturnCode() != 410));
+			try {
+				$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) {
+					$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 && ($curlResult->getReturnCode() == 410)) {
+					$data = ['@context' => ActivityPub::CONTEXT, 'id' => $url, 'type' => 'Tombstone'];
+				}
+			} catch (\Exception $exception) {
+				Logger::notice('Error fetching url', ['url' => $url, 'exception' => $exception]);
+				$failed = true;
 			}
 
 			if ($failed) {
@@ -254,6 +266,11 @@ class APContact
 		$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');
+		} elseif (empty($apcontact['photo'])) {
+			$photo = JsonLD::fetchElementArray($compacted, 'as:icon', 'as:url');
+			if (!empty($photo[0]['@id'])) {
+				$apcontact['photo'] = $photo[0]['@id'];
+			}
 		}
 
 		$apcontact['header'] = JsonLD::fetchElement($compacted, 'as:image', '@id');
@@ -311,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?
@@ -327,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?
@@ -343,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)) {
@@ -371,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) {
@@ -570,15 +587,20 @@ class APContact
 	 */
 	public static function isRelay(array $apcontact): bool
 	{
-		if (empty($apcontact['nick']) || $apcontact['nick'] != 'relay') {
+		if (!in_array($apcontact['type'] ?? '', ['Application', 'Group', 'Service'])) {
 			return false;
 		}
 
-		if (!empty($apcontact['type']) && $apcontact['type'] == 'Application') {
+		$path = parse_url($apcontact['url'], PHP_URL_PATH);
+		if (($apcontact['type'] == 'Group') && !empty($apcontact['followers']) && ($apcontact['nick'] == 'relay') && ($path == '/actor')) {
+			return true;
+		}
+
+		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;
 		}