X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FAPContact.php;h=fd748f1cd4e92419b77513f5cad205a3cec60fcb;hb=60551e6277a4e3a0901481e2a23b3963db6a1c2c;hp=841c028909b65c56913487844ce767fcf00a502e;hpb=a5d679ea959a4317be76efd8cad99bf00ba6e3d0;p=friendica.git

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 841c028909..fd748f1cd4 100644
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -24,9 +24,11 @@ namespace Friendica\Model;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 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;
@@ -38,6 +40,7 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\JsonLD;
 use Friendica\Util\Network;
+use GuzzleHttp\Psr7\Uri;
 
 class APContact
 {
@@ -59,7 +62,7 @@ class APContact
 				'addr'      => $local_owner['addr'],
 				'baseurl'   => $local_owner['baseurl'],
 				'url'       => $local_owner['url'],
-				'subscribe' => $local_owner['baseurl'] . '/follow?url={uri}'];
+				'subscribe' => $local_owner['baseurl'] . '/contact/follow?url={uri}'];
 
 			if (!empty($local_owner['alias']) && ($local_owner['url'] != $local_owner['alias'])) {
 				$data['alias'] = $local_owner['alias'];
@@ -288,28 +291,27 @@ class APContact
 			return $fetched_contact;
 		}
 
-		$parts = parse_url($apcontact['url']);
-		unset($parts['scheme']);
-		unset($parts['path']);
-
 		if (empty($apcontact['addr'])) {
-			if (!empty($apcontact['nick']) && is_array($parts)) {
-				$apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
-			} else {
+			try {
+				$apcontact['addr'] = $apcontact['nick'] . '@' . (new Uri($apcontact['url']))->getAuthority();
+			} catch (\Throwable $e) {
+				Logger::warning('Unable to coerce APContact URL into a UriInterface object', ['url' => $apcontact['url'], 'error' => $e->getMessage()]);
 				$apcontact['addr'] = '';
 			}
 		}
 
 		$apcontact['pubkey'] = null;
 		if (!empty($compacted['w3id:publicKey'])) {
-			$apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted['w3id:publicKey'], 'w3id:publicKeyPem', '@value'));
-			if (strstr($apcontact['pubkey'], 'RSA ')) {
+			$apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted['w3id:publicKey'], 'w3id:publicKeyPem', '@value') ?? '');
+			if (strpos($apcontact['pubkey'], 'RSA ') !== false) {
 				$apcontact['pubkey'] = Crypto::rsaToPem($apcontact['pubkey']);
 			}
 		}
 
 		$apcontact['manually-approve'] = (int)JsonLD::fetchElement($compacted, 'as:manuallyApprovesFollowers');
 
+		$apcontact['suspended'] = (int)JsonLD::fetchElement($compacted, 'toot:suspended');
+
 		if (!empty($compacted['as:generator'])) {
 			$apcontact['baseurl'] = JsonLD::fetchElement($compacted['as:generator'], 'as:url', '@id');
 			$apcontact['generator'] = JsonLD::fetchElement($compacted['as:generator'], 'as:name', '@value');
@@ -349,17 +351,18 @@ class APContact
 
 		if (!empty($apcontact['outbox'])) {
 			if (!empty($local_owner)) {
-				$outbox = ActivityPub\Transmitter::getOutbox($local_owner);
+				$statuses_count = self::getStatusesCount($local_owner);
 			} else {
 				$outbox = ActivityPub::fetchContent($apcontact['outbox']);
+				$statuses_count = $outbox['totalItems'] ?? 0;
 			}
-			if (!empty($outbox['totalItems'])) {
+			if (!empty($statuses_count)) {
 				// 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;
+				if ($statuses_count < 0) {
+					$statuses_count = 0;
 				}
-				$apcontact['statuses_count'] = $outbox['totalItems'];
+				$apcontact['statuses_count'] = $statuses_count;
 			}
 		}
 
@@ -377,14 +380,14 @@ class APContact
 		// kroeg:blocks, updated
 
 		// When the photo is too large, try to shorten it by removing parts
-		if (strlen($apcontact['photo']) > 255) {
+		if (strlen($apcontact['photo'] ?? '') > 255) {
 			$parts = parse_url($apcontact['photo']);
 			unset($parts['fragment']);
-			$apcontact['photo'] = Network::unparseURL($parts);
+			$apcontact['photo'] = (string)Uri::fromParts($parts);
 
 			if (strlen($apcontact['photo']) > 255) {
 				unset($parts['query']);
-				$apcontact['photo'] = Network::unparseURL($parts);
+				$apcontact['photo'] = (string)Uri::fromParts($parts);
 			}
 
 			if (strlen($apcontact['photo']) > 255) {
@@ -480,6 +483,30 @@ class APContact
 		return DBA::selectFirst('apcontact', [], ['url' => $apcontact['url']]) ?: [];
 	}
 
+	/**
+	 * Fetch the number of statuses for the given owner
+	 *
+	 * @param array $owner
+	 *
+	 * @return integer
+	 */
+	private static function getStatusesCount(array $owner): int
+	{
+		$condition = [
+			'private'        => [Item::PUBLIC, Item::UNLISTED],
+			'author-id'      => Contact::getIdForURL($owner['url'], 0, false),
+			'gravity'        => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT],
+			'network'        => Protocol::DFRN,
+			'parent-network' => Protocol::FEDERATED,
+			'deleted'        => false,
+			'visible'        => true,
+		];
+
+		$count = Post::countPosts($condition);
+
+		return $count;
+	}
+
 	/**
 	 * Mark the given AP Contact as "to archive"
 	 *
@@ -544,19 +571,19 @@ class APContact
 	 *
 	 * @param array $apcontact
 	 *
-	 * @return bool 
+	 * @return bool
 	 */
 	public static function isRelay(array $apcontact): bool
 	{
-		if ($apcontact['nick'] != 'relay') {
+		if (empty($apcontact['nick']) || $apcontact['nick'] != 'relay') {
 			return false;
 		}
 
-		if ($apcontact['type'] == 'Application') {
+		if (!empty($apcontact['type']) && $apcontact['type'] == 'Application') {
 			return true;
 		}
 
-		if (in_array($apcontact['type'], ['Group', 'Service']) && is_null($apcontact['outbox'])) {
+		if (!empty($apcontact['type']) && in_array($apcontact['type'], ['Group', 'Service']) && is_null($apcontact['outbox'])) {
 			return true;
 		}