Merge remote-tracking branch 'upstream/develop' into item-view

[friendica.git] / src / Model / Contact / Relation.php

diff --git a/src/Model/Contact/Relation.php b/src/Model/Contact/Relation.php
index d1e51811ff8fce5a777a6b36ff6a68966ca73a0d..3c95973238e1e9d43aae474927db3c2e35519529 100644 (file)
--- a/src/Model/Contact/Relation.php
+++ b/src/Model/Contact/Relation.php
@@ -28,6 +28,8 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
+use Friendica\Model\Profile;
+use Friendica\Model\User;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
@@ -82,18 +84,25 @@ class Relation
                        return;
                }
 
-               $apcontact = APContact::getByURL($url, false);
-
-               if (!empty($apcontact['followers']) && is_string($apcontact['followers'])) {
-                       $followers = ActivityPub::fetchItems($apcontact['followers']);
+               $uid = User::getIdForURL($url);
+               if (!empty($uid)) {
+                       // Fetch the followers/followings locally
+                       $followers = self::getContacts($uid, [Contact::FOLLOWER, Contact::FRIEND]);
+                       $followings = self::getContacts($uid, [Contact::SHARING, Contact::FRIEND]);
                } else {
-                       $followers = [];
-               }
+                       $apcontact = APContact::getByURL($url, false);
 
-               if (!empty($apcontact['following']) && is_string($apcontact['following'])) {
-                       $followings = ActivityPub::fetchItems($apcontact['following']);
-               } else {
-                       $followings = [];
+                       if (!empty($apcontact['followers']) && is_string($apcontact['followers'])) {
+                               $followers = ActivityPub::fetchItems($apcontact['followers']);
+                       } else {
+                               $followers = [];
+                       }
+
+                       if (!empty($apcontact['following']) && is_string($apcontact['following'])) {
+                               $followings = ActivityPub::fetchItems($apcontact['following']);
+                       } else {
+                               $followings = [];
+                       }
                }
 
                if (empty($followers) && empty($followings)) {
@@ -150,6 +159,33 @@ class Relation
                return;
        }
 
+       /**
+        * Fetch contact url list from the given local user
+        *
+        * @param integer $uid
+        * @param array $rel
+        * @return array contact list
+        */
+       private static function getContacts(int $uid, array $rel)
+       {
+               $list = [];
+               $profile = Profile::getByUID($uid);
+               if (!empty($profile['hide-friends'])) {
+                       return $list;
+               }
+
+               $condition = ['rel' => $rel, 'uid' => $uid, 'self' => false, 'deleted' => false,
+                       'hidden' => false, 'archive' => false, 'pending' => false];
+               $condition = DBA::mergeConditions($condition, ["`url` IN (SELECT `url` FROM `apcontact`)"]);
+               $contacts = DBA::select('contact', ['url'], $condition);
+               while ($contact = DBA::fetch($contacts)) {
+                       $list[] = $contact['url'];
+               }
+               DBA::close($contacts);
+
+               return $list;
+       }
+
        /**
         * Tests if a given contact url is discoverable
         *
@@ -166,7 +202,7 @@ class Relation
                }
 
                if (empty($contact)) {
-                       $contact = Contact::getByURL($url);
+                       $contact = Contact::getByURL($url, false);
                }
 
                if (empty($contact)) {
@@ -433,7 +469,7 @@ class Relation
                );
 
                return DI::dba()->selectToArray('contact', [], $condition,
-                       ['limit' => [$offset, $count], 'order' => [$shuffle ? 'name' : 'RAND()']]
+                       ['limit' => [$offset, $count], 'order' => [$shuffle ? 'RAND()' : 'name']]
                );
        }
 
@@ -449,8 +485,8 @@ class Relation
        public static function countAll(int $cid, array $condition = [])
        {
                $condition = DBA::mergeConditions($condition,
-                       ['`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`) 
-                       OR `id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`)',
+                       ['(`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`) 
+                       OR `id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`))',
                                $cid, $cid]
                );
 
@@ -471,13 +507,13 @@ class Relation
        public static function listAll(int $cid, array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
        {
                $condition = DBA::mergeConditions($condition,
-                       ['`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`) 
-                       OR `id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`)',
+                       ['(`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`) 
+                       OR `id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`))',
                                $cid, $cid]
                );
 
                return DI::dba()->selectToArray('contact', [], $condition,
-                       ['limit' => [$offset, $count], 'order' => [$shuffle ? 'name' : 'RAND()']]
+                       ['limit' => [$offset, $count], 'order' => [$shuffle ? 'RAND()' : 'name']]
                );
        }
 
@@ -524,7 +560,7 @@ class Relation
                );
 
                return DI::dba()->selectToArray('contact', [], $condition,
-                       ['limit' => [$offset, $count], 'order' => [$shuffle ? 'name' : 'RAND()']]
+                       ['limit' => [$offset, $count], 'order' => [$shuffle ? 'RAND()' : 'name']]
                );
        }
 
@@ -569,7 +605,7 @@ class Relation
                );
 
                return DI::dba()->selectToArray('contact', [], $condition,
-                       ['limit' => [$offset, $count], 'order' => [$shuffle ? 'name' : 'RAND()']]
+                       ['limit' => [$offset, $count], 'order' => [$shuffle ? 'RAND()' : 'name']]
                );
        }
 
@@ -614,7 +650,7 @@ class Relation
                );
 
                return DI::dba()->selectToArray('contact', [], $condition,
-                       ['limit' => [$offset, $count],  'order' => [$shuffle ? 'name' : 'RAND()']]
+                       ['limit' => [$offset, $count],  'order' => [$shuffle ? 'RAND()' : 'name']]
                );
        }
 }