X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FAPContact.php;h=7b49bab8abf77248eaf9252a9f555fdd197785bd;hb=da66730e4f142c3557cdf7343bc420f7b80c883e;hp=9269ee7903875f386e07a26645aebfe14441cf72;hpb=d2ca812647c0c06665e008354aa692d492f8857a;p=friendica.git

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 9269ee7903..7b49bab8ab 100644
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -24,10 +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\Database\DBStructure;
 use Friendica\DI;
+use Friendica\Model\Item;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPException;
 use Friendica\Network\Probe;
@@ -39,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
 {
@@ -165,6 +167,8 @@ class APContact
 				return $fetched_contact;
 			}
 			$url = $apcontact['url'];
+		} elseif (empty(parse_url($url, PHP_URL_PATH))) {
+			$apcontact['baseurl'] = $url;
 		}
 
 		// Detect multiple fast repeating request to the same address
@@ -309,6 +313,8 @@ class APContact
 
 		$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');
@@ -348,17 +354,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;
 			}
 		}
 
@@ -379,11 +386,11 @@ class APContact
 		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) {
@@ -466,7 +473,7 @@ class APContact
 		}
 
 		// Limit the length on incoming fields
-		$apcontact = DBStructure::getFieldsForTable('apcontact', $apcontact);
+		$apcontact = DI::dbaDefinition()->truncateFieldsForTable('apcontact', $apcontact);
 
 		if (DBA::exists('apcontact', ['url' => $apcontact['url']])) {
 			DBA::update('apcontact', $apcontact, ['url' => $apcontact['url']]);
@@ -479,6 +486,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"
 	 *
@@ -537,4 +568,28 @@ class APContact
 
 		HTTPSignature::setInboxStatus($url, true, $shared);
 	}
+
+	/**
+	 * Check if the apcontact is a relay account
+	 *
+	 * @param array $apcontact
+	 *
+	 * @return bool 
+	 */
+	public static function isRelay(array $apcontact): bool
+	{
+		if (empty($apcontact['nick']) || $apcontact['nick'] != 'relay') {
+			return false;
+		}
+
+		if (!empty($apcontact['type']) && $apcontact['type'] == 'Application') {
+			return true;
+		}
+
+		if (!empty($apcontact['type']) && in_array($apcontact['type'], ['Group', 'Service']) && is_null($apcontact['outbox'])) {
+			return true;
+		}
+
+		return false;
+	}
 }