Rewrite:

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

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index bb6f12e10c292c4c62bd36bb73c2cb559d90953a..7b49bab8abf77248eaf9252a9f555fdd197785bd 100644 (file)
--- 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;
@@ -352,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;
                        }
                }
 
@@ -383,11 +386,11 @@ class APContact
                if (strlen($apcontact['photo']) > 255) {
                        $parts = parse_url($apcontact['photo']);
                        unset($parts['fragment']);
-                       $apcontact['photo'] = Uri::fromParts($parts);
+                       $apcontact['photo'] = (string)Uri::fromParts($parts);
 
                        if (strlen($apcontact['photo']) > 255) {
                                unset($parts['query']);
-                               $apcontact['photo'] = Uri::fromParts($parts);
+                               $apcontact['photo'] = (string)Uri::fromParts($parts);
                        }
 
                        if (strlen($apcontact['photo']) > 255) {
@@ -483,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"
         *
@@ -551,15 +578,15 @@ class APContact
         */
        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;
                }