bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Use the new relation functions

Browse source
This commit is contained in:
Michael 2020-08-03 18:21:56 +00:00
parent 879c30d4fa
commit ee1cb93f3a
3 changed files with 3 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Model/GContact.php
View file

@ -22,9 +22,7 @@
namespace Friendica\Model; namespace Friendica\Model;
use Exception; use Exception;
use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Util\DateTimeFormat;
/** /**
* This class handles GlobalContact related functions * This class handles GlobalContact related functions
@ -138,32 +136,4 @@ LIMIT 1",
return Contact\Relation::listCommonFollows($sourceId, $targetPublicContact['id'] ?? 0, $condition, $limit, $start, $shuffle); 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);
}
} }

4
src/Module/AllFriends.php
View file

@ -63,11 +63,11 @@ class AllFriends extends BaseModule
DI::page()['aside'] = ""; DI::page()['aside'] = "";
Model\Profile::load($app, "", Model\Contact::getByURL($contact["url"], false)); 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()); $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)) { if (empty($friends)) {
return DI::l10n()->t('No friends to display.'); return DI::l10n()->t('No friends to display.');
} }

2
src/Module/Contact.php
View file

@ -901,7 +901,7 @@ class Contact extends BaseModule
]; ];
// Show this tab only if there is visible friend list // Show this tab only if there is visible friend list
$x = Model\Contact::countContactsOfContact($pcid); $x = Model\Contact\Relation::countFollows($pcid);
if ($x) { if ($x) {
$tabs[] = ['label' => DI::l10n()->t('Contacts'), $tabs[] = ['label' => DI::l10n()->t('Contacts'),
'url' => "allfriends/" . $pcid, 'url' => "allfriends/" . $pcid,