X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FAPContact.php;h=ff151e469e119b579e9edc1442eeabe0818b88ac;hb=999c56a2845ba94cc7c6950a2c951fedc8c966b6;hp=20457b46e838c407bb78dd3c52b0bb4cc954b074;hpb=1d6f5c33a1a7c538d4e529d22701fd735855da15;p=friendica.git

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 20457b46e8..ff151e469e 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;
 			}
@@ -193,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);
@@ -259,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');
@@ -575,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;
 		}