Merge pull request #12228 from MrPetovan/task/4090-move-mod-photos

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

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 043f33c313352c940f8e2817f3bb3a860c035b37..3b568f39f1d85c5c7be8880668adfe97d7c94e43 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -28,6 +28,7 @@ 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;
@@ -61,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'];
@@ -382,7 +383,7 @@ 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'] = (string)Uri::fromParts($parts);
@@ -495,13 +496,13 @@ class APContact
        private static function getStatusesCount(array $owner): int
        {
                $condition = [
-                       'private' => [Item::PUBLIC, Item::UNLISTED],
+                       'private'        => [Item::PUBLIC, Item::UNLISTED],
                        'author-id'      => Contact::getIdForURL($owner['url'], 0, false),
-                       'gravity'        => [GRAVITY_PARENT, GRAVITY_COMMENT],
+                       'gravity'        => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT],
                        'network'        => Protocol::DFRN,
                        'parent-network' => Protocol::FEDERATED,
                        'deleted'        => false,
-                       'visible'        => true
+                       'visible'        => true,
                ];
 
                $count = Post::countPosts($condition);
@@ -573,7 +574,7 @@ class APContact
         *
         * @param array $apcontact
         *
-        * @return bool 
+        * @return bool
         */
        public static function isRelay(array $apcontact): bool
        {