keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adding $fields

Browse source
This commit is contained in:
Michael 2020-08-03 19:38:03 +00:00
parent 14bb6daa5d
commit 4e90029234
2 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/Model/Contact/Relation.php
View file

@ -231,6 +231,7 @@ class Relation
* Returns a paginated list of contacts that are followed the provided public contact. * Returns a paginated list of contacts that are followed the provided public contact.
* *
* @param int $cid Public contact id * @param int $cid Public contact id
* @param array $field Field list
* @param array $condition Additional condition on the contact table * @param array $condition Additional condition on the contact table
* @param int $count * @param int $count
* @param int $offset * @param int $offset
@ -238,14 +239,14 @@ class Relation
* @return array * @return array
* @throws Exception * @throws Exception
*/ */
public static function listFollows(int $cid, array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false) public static function listFollows(int $cid, array $fields = [], array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
{ {
$condition = DBA::mergeConditions($condition, $condition = DBA::mergeConditions($condition,
['`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`)', ['`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`)',
$cid] $cid]
); );
return DI::dba()->selectToArray('contact', [], $condition, return DI::dba()->selectToArray('contact', $fields, $condition,
['limit' => [$offset, $count], 'order' => [$shuffle ? 'RAND()' : 'name']] ['limit' => [$offset, $count], 'order' => [$shuffle ? 'RAND()' : 'name']]
); );
} }
@ -272,6 +273,7 @@ class Relation
* Returns a paginated list of contacts that follow the provided public contact. * Returns a paginated list of contacts that follow the provided public contact.
* *
* @param int $cid Public contact id * @param int $cid Public contact id
* @param array $field Field list
* @param array $condition Additional condition on the contact table * @param array $condition Additional condition on the contact table
* @param int $count * @param int $count
* @param int $offset * @param int $offset
@ -279,17 +281,15 @@ class Relation
* @return array * @return array
* @throws Exception * @throws Exception
*/ */
public static function listFollowers(int $cid, array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false) public static function listFollowers(int $cid, array $fields = [], array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
{ {
$condition = DBA::mergeConditions($condition, $condition = DBA::mergeConditions($condition,
['`id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`)', $cid] ['`id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`)', $cid]
); );
$followers = DI::dba()->selectToArray('contact', [], $condition, return DI::dba()->selectToArray('contact', $fields, $condition,
['limit' => [$offset, $count], 'order' => [$shuffle ? 'RAND()' : 'name']] ['limit' => [$offset, $count], 'order' => [$shuffle ? 'RAND()' : 'name']]
); );
return $followers;
} }
/** /**
@ -310,9 +310,7 @@ class Relation
$sourceId, $targetId] $sourceId, $targetId]
); );
$total = DI::dba()->count('contact', $condition); return DI::dba()->count('contact', $condition);
return $total;
} }
/** /**
@ -321,6 +319,7 @@ class Relation
* *
* @param int $sourceId Public contact id * @param int $sourceId Public contact id
* @param int $targetId Public contact id * @param int $targetId Public contact id
* @param array $field Field list
* @param array $condition Additional condition on the contact table * @param array $condition Additional condition on the contact table
* @param int $count * @param int $count
* @param int $offset * @param int $offset
@ -328,7 +327,7 @@ class Relation
* @return array * @return array
* @throws Exception * @throws Exception
*/ */
public static function listCommon(int $sourceId, int $targetId, array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false) public static function listCommon(int $sourceId, int $targetId, array $fields = [], array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
{ {
$condition = DBA::mergeConditions($condition, $condition = DBA::mergeConditions($condition,
["`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`) ["`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`)
@ -336,11 +335,9 @@ class Relation
$sourceId, $targetId] $sourceId, $targetId]
); );
$contacts = DI::dba()->selectToArray('contact', [], $condition, return DI::dba()->selectToArray('contact', $fields, $condition,
['limit' => [$offset, $count], 'order' => [$shuffle ? 'name' : 'RAND()']] ['limit' => [$offset, $count], 'order' => [$shuffle ? 'name' : 'RAND()']]
); );
return $contacts;
} }
@ -361,9 +358,7 @@ class Relation
$sourceId, $targetId] $sourceId, $targetId]
); );
$total = DI::dba()->count('contact', $condition); return DI::dba()->count('contact', $condition);
return $total;
} }
/** /**
@ -371,6 +366,7 @@ class Relation
* *
* @param int $sourceId Public contact id * @param int $sourceId Public contact id
* @param int $targetId Public contact id * @param int $targetId Public contact id
* @param array $field Field list
* @param array $condition Additional condition array on the contact table * @param array $condition Additional condition array on the contact table
* @param int $count * @param int $count
* @param int $offset * @param int $offset
@ -378,7 +374,7 @@ class Relation
* @return array * @return array
* @throws Exception * @throws Exception
*/ */
public static function listCommonFollows(int $sourceId, int $targetId, array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false) public static function listCommonFollows(int $sourceId, int $targetId, array $fields = [], array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
{ {
$condition = DBA::mergeConditions($condition, $condition = DBA::mergeConditions($condition,
["`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`) ["`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`)
@ -386,11 +382,9 @@ class Relation
$sourceId, $targetId] $sourceId, $targetId]
); );
$contacts = DI::dba()->selectToArray('contact', [], $condition, return DI::dba()->selectToArray('contact', $fields, $condition,
['limit' => [$offset, $count], 'order' => [$shuffle ? 'name' : 'RAND()']] ['limit' => [$offset, $count], 'order' => [$shuffle ? 'name' : 'RAND()']]
); );
return $contacts;
} }
/** /**
@ -418,6 +412,7 @@ class Relation
* *
* @param int $sourceId Public contact id * @param int $sourceId Public contact id
* @param int $targetId Public contact id * @param int $targetId Public contact id
* @param array $field Field list
* @param array $condition Additional condition on the contact table * @param array $condition Additional condition on the contact table
* @param int $count * @param int $count
* @param int $offset * @param int $offset
@ -425,7 +420,7 @@ class Relation
* @return array * @return array
* @throws Exception * @throws Exception
*/ */
public static function listCommonFollowers(int $sourceId, int $targetId, array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false) public static function listCommonFollowers(int $sourceId, int $targetId, array $fields = [], array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
{ {
$condition = DBA::mergeConditions($condition, $condition = DBA::mergeConditions($condition,
["`id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`) ["`id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`)
@ -433,7 +428,7 @@ class Relation
$sourceId, $targetId] $sourceId, $targetId]
); );
return DI::dba()->selectToArray('contact', [], $condition, return DI::dba()->selectToArray('contact', $fields, $condition,
['limit' => [$offset, $count], 'order' => [$shuffle ? 'name' : 'RAND()']] ['limit' => [$offset, $count], 'order' => [$shuffle ? 'name' : 'RAND()']]
); );
} }

2
src/Module/AllFriends.php
View file

@ -67,7 +67,7 @@ class AllFriends extends BaseModule
$pager = new Pager(DI::l10n(), DI::args()->getQueryString()); $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
$friends = Model\Contact\Relation::listFollows($cid, [], $pager->getItemsPerPage(), $pager->getStart()); $friends = Model\Contact\Relation::listFollows($cid, [], [], $pager->getItemsPerPage(), $pager->getStart());
if (empty($friends)) { if (empty($friends)) {
return DI::l10n()->t('No friends to display.'); return DI::l10n()->t('No friends to display.');
} }