Use the new relation functions

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 78583bcc5a1f08b9a7fd6c2e9e7ec6b77bd6e305..3fe123e15f2ac6d300ead4fb69d407acf36f01f9 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -22,9 +22,7 @@
 namespace Friendica\Model;
 
 use Exception;
-use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Util\DateTimeFormat;
 
 /**
  * This class handles GlobalContact related functions
@@ -138,32 +136,4 @@ LIMIT 1",
 
                return Contact\Relation::listCommonFollows($sourceId, $targetPublicContact['id'] ?? 0, $condition, $limit, $start, $shuffle);
        }
-
-       /**
-        * @param integer $uid user
-        * @param integer $cid cid
-        * @return integer
-        * @throws Exception
-        */
-       public static function countAllFriends($uid, $cid)
-       {
-               $cids = Contact::getPublicAndUserContacID($cid, $uid);
-
-               return Contact\Relation::countFollows($cids['public'] ?? 0);
-       }
-
-       /**
-        * @param integer $uid   user
-        * @param integer $cid   cid
-        * @param integer $start optional, default 0
-        * @param integer $limit optional, default 80
-        * @return array
-        * @throws Exception
-        */
-       public static function allFriends($uid, $cid, $start = 0, $limit = 80)
-       {
-               $cids = Contact::getPublicAndUserContacID($cid, $uid);
-
-               return Contact\Relation::listFollows($cids['public'] ?? 0, [], $limit, $start);
-       }
 }

diff --git a/src/Module/AllFriends.php b/src/Module/AllFriends.php
index 00614a1330a3d2c3a1ede367e061fc1a00dfea95..f25f751c271bf244b8afe70ec710cea41a1bbd08 100644 (file)
--- a/src/Module/AllFriends.php
+++ b/src/Module/AllFriends.php
@@ -63,11 +63,11 @@ class AllFriends extends BaseModule
                DI::page()['aside'] = "";
                Model\Profile::load($app, "", Model\Contact::getByURL($contact["url"], false));
 
-               $total = Model\Contact::countContactsOfContact($cid);
+               $total = Model\Contact\Relation::countFollows($cid);
 
                $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
-               $friends = Model\Contact::getContactsOfContact($cid, $pager->getStart(), $pager->getItemsPerPage());
+               $friends = Model\Contact\Relation::listFollows($cid, [], $pager->getStart(), $pager->getItemsPerPage());
                if (empty($friends)) {
                        return DI::l10n()->t('No friends to display.');
                }

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 73be9ecab53be29cf6d7a160fb20335ef5edd6ef..b8c8827b2428db8b3e94da2d87d658454da45f1f 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -901,7 +901,7 @@ class Contact extends BaseModule
                ];
 
                // Show this tab only if there is visible friend list
-               $x = Model\Contact::countContactsOfContact($pcid);
+               $x = Model\Contact\Relation::countFollows($pcid);
                if ($x) {
                        $tabs[] = ['label' => DI::l10n()->t('Contacts'),
                                'url'   => "allfriends/" . $pcid,