Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-05 23:04:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Allow the search for contacts on blocked servers via web

Browse source
This commit is contained in:
Michael 2023-03-29 18:39:21 +00:00
parent e6ce165bb5
commit f0743e4e12
4 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Model/Contact.php
View file

@ -3504,16 +3504,17 @@ class Contact
/**
* Search contact table by nick or name
*
* @param string $search Name or nick
* @param string $mode Search mode (e.g. "community")
* @param int $uid User ID
* @param int $limit Maximum amount of returned values
* @param int $offset Limit offset
* @param string $search Name or nick
* @param string $mode Search mode (e.g. "community")
* @param bool $show_blocked Show users from blocked servers. Default is false
* @param int $uid User ID
* @param int $limit Maximum amount of returned values
* @param int $offset Limit offset
*
* @return array with search results
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function searchByName(string $search, string $mode = '', int $uid = 0, int $limit = 0, int $offset = 0): array
public static function searchByName(string $search, string $mode = '', bool $show_blocked = false, int $uid = 0, int $limit = 0, int $offset = 0): array
{
if (empty($search)) {
return [];
@ -3532,13 +3533,16 @@ class Contact
$condition = [
'network' => $networks,
'server-failed' => false,
'server-blocked' => false,
'failed' => false,
'deleted' => false,
'unsearchable' => false,
'uid' => $uid
];
if (!$show_blocked) {
$condition['server-blocked'] = true;
}
if ($uid == 0) {
$condition['blocked'] = false;
} else {