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

Merge pull request #12589 from MrPetovan/bug/warnings 

Address a few warnings in Search\Acl
This commit is contained in:
Michael Vogel 2023-01-02 00:53:26 +01:00 committed by GitHub
parent 4faf08c064 f9676c9ed2
commit 3f30980591
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 124 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Core/Search.php
View File

@ -233,7 +233,24 @@ class Search
if ($curlResult->isSuccess()) { if ($curlResult->isSuccess()) {
$searchResult = json_decode($curlResult->getBody(), true); $searchResult = json_decode($curlResult->getBody(), true);
if (!empty($searchResult['profiles'])) { if (!empty($searchResult['profiles'])) {
$return = $searchResult['profiles']; // Converting Directory Search results into contact-looking records
$return = array_map(function ($result) {
static $contactType = [
'People' => Contact::TYPE_PERSON,
'Forum' => Contact::TYPE_COMMUNITY,
'Organization' => Contact::TYPE_ORGANISATION,
'News' => Contact::TYPE_NEWS,
];
return [
'name' => $result['name'],
'addr' => $result['addr'],
'url' => $result['profile_url'],
'network' => Protocol::DFRN,
'micro' => $result['photo'],
'contact-type' => $contactType[$result['account_type']],
];
}, $searchResult['profiles']);
} }
} }
} }

202
src/Module/Search/Acl.php
View File

@ -21,18 +21,23 @@
namespace Friendica\Module\Search; namespace Friendica\Module\Search;
use Friendica\App;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Content\Widget; use Friendica\Content\Widget;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\L10n;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\Search; use Friendica\Core\Search;
use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\Database;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Module\Response;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
use Friendica\Util\Profiler;
use Psr\Log\LoggerInterface;
/** /**
* ACL selector json backend * ACL selector json backend
@ -49,28 +54,41 @@ class Acl extends BaseModule
const TYPE_PRIVATE_MESSAGE = 'm'; const TYPE_PRIVATE_MESSAGE = 'm';
const TYPE_ANY_CONTACT = 'a'; const TYPE_ANY_CONTACT = 'a';
/** @var IHandleUserSessions */
private $session;
/** @var Database */
private $database;
public function __construct(Database $database, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
{
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
$this->session = $session;
$this->database = $database;
}
protected function rawContent(array $request = []) protected function rawContent(array $request = [])
{ {
if (!DI::userSession()->getLocalUserId()) { if (!$this->session->getLocalUserId()) {
throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this module.')); throw new HTTPException\UnauthorizedException($this->t('You must be logged in to use this module.'));
} }
$type = $_REQUEST['type'] ?? self::TYPE_MENTION_CONTACT_GROUP; $type = $request['type'] ?? self::TYPE_MENTION_CONTACT_GROUP;
if ($type === self::TYPE_GLOBAL_CONTACT) { if ($type === self::TYPE_GLOBAL_CONTACT) {
$o = self::globalContactSearch(); $o = $this->globalContactSearch($request);
} else { } else {
$o = self::regularContactSearch($type); $o = $this->regularContactSearch($request, $type);
} }
System::jsonExit($o); System::jsonExit($o);
} }
private static function globalContactSearch(): array private function globalContactSearch(array $request): array
{ {
// autocomplete for global contact search (e.g. navbar search) // autocomplete for global contact search (e.g. navbar search)
$search = trim($_REQUEST['search']); $search = trim($request['search']);
$mode = $_REQUEST['smode']; $mode = $request['smode'];
$page = $_REQUEST['page'] ?? 1; $page = $request['page'] ?? 1;
$result = Search::searchContact($search, $mode, $page); $result = Search::searchContact($search, $mode, $page);
@ -86,89 +104,87 @@ class Acl extends BaseModule
]; ];
} }
$o = [ return [
'start' => ($page - 1) * 20, 'start' => ($page - 1) * 20,
'count' => 1000, 'count' => 1000,
'items' => $contacts, 'items' => $contacts,
]; ];
return $o;
} }
private static function regularContactSearch(string $type): array private function regularContactSearch(array $request, string $type): array
{ {
$start = $_REQUEST['start'] ?? 0; $start = $request['start'] ?? 0;
$count = $_REQUEST['count'] ?? 100; $count = $request['count'] ?? 100;
$search = $_REQUEST['search'] ?? ''; $search = $request['search'] ?? '';
$conv_id = $_REQUEST['conversation'] ?? null; $conv_id = $request['conversation'] ?? null;
// For use with jquery.textcomplete for private mail completion // For use with jquery.textcomplete for private mail completion
if (!empty($_REQUEST['query'])) { if (!empty($request['query'])) {
if (!$type) { if (!$type) {
$type = self::TYPE_PRIVATE_MESSAGE; $type = self::TYPE_PRIVATE_MESSAGE;
} }
$search = $_REQUEST['query']; $search = $request['query'];
} }
Logger::info('ACL {action} - {subaction} - start', ['module' => 'acl', 'action' => 'content', 'subaction' => 'search', 'search' => $search, 'type' => $type, 'conversation' => $conv_id]); $this->logger->info('ACL {action} - {subaction} - start', ['module' => 'acl', 'action' => 'content', 'subaction' => 'search', 'search' => $search, 'type' => $type, 'conversation' => $conv_id]);
$sql_extra = ''; $sql_extra = '';
$condition = ["`uid` = ? AND NOT `deleted` AND NOT `pending` AND NOT `archive`", DI::userSession()->getLocalUserId()]; $condition = ["`uid` = ? AND NOT `deleted` AND NOT `pending` AND NOT `archive`", $this->session->getLocalUserId()];
$condition_group = ["`uid` = ? AND NOT `deleted`", DI::userSession()->getLocalUserId()]; $condition_group = ["`uid` = ? AND NOT `deleted`", $this->session->getLocalUserId()];
if ($search != '') { if ($search != '') {
$sql_extra = "AND `name` LIKE '%%" . DBA::escape($search) . "%%'"; $sql_extra = "AND `name` LIKE '%%" . $this->database->escape($search) . "%%'";
$condition = DBA::mergeConditions($condition, ["(`attag` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?)", $condition = DBA::mergeConditions($condition, ["(`attag` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?)",
'%' . $search . '%', '%' . $search . '%', '%' . $search . '%']); '%' . $search . '%', '%' . $search . '%', '%' . $search . '%']);
$condition_group = DBA::mergeConditions($condition_group, ["`name` LIKE ?", '%' . $search . '%']); $condition_group = DBA::mergeConditions($condition_group, ["`name` LIKE ?", '%' . $search . '%']);
} }
// count groups and contacts // count groups and contacts
$group_count = 0; $group_count = 0;
if ($type == self::TYPE_MENTION_CONTACT_GROUP || $type == self::TYPE_MENTION_GROUP) { if ($type == self::TYPE_MENTION_CONTACT_GROUP || $type == self::TYPE_MENTION_GROUP) {
$group_count = DBA::count('group', $condition_group); $group_count = $this->database->count('group', $condition_group);
} }
$networks = Widget::unavailableNetworks(); $networks = Widget::unavailableNetworks();
$condition = DBA::mergeConditions($condition, array_merge(["NOT `network` IN (" . substr(str_repeat("?, ", count($networks)), 0, -2) . ")"], $networks)); $condition = DBA::mergeConditions($condition, array_merge(["NOT `network` IN (" . substr(str_repeat("?, ", count($networks)), 0, -2) . ")"], $networks));
switch ($type) { switch ($type) {
case self::TYPE_MENTION_CONTACT_GROUP: case self::TYPE_MENTION_CONTACT_GROUP:
$condition = DBA::mergeConditions($condition, $condition = DBA::mergeConditions($condition,
["NOT `self` AND NOT `blocked` AND `notify` != ? AND `network` != ?", '', Protocol::OSTATUS ["NOT `self` AND NOT `blocked` AND `notify` != ? AND `network` != ?", '', Protocol::OSTATUS
]); ]);
break; break;
case self::TYPE_MENTION_CONTACT: case self::TYPE_MENTION_CONTACT:
$condition = DBA::mergeConditions($condition, $condition = DBA::mergeConditions($condition,
["NOT `self` AND NOT `blocked` AND `notify` != ?", '' ["NOT `self` AND NOT `blocked` AND `notify` != ?", ''
]); ]);
break; break;
case self::TYPE_MENTION_FORUM: case self::TYPE_MENTION_FORUM:
$condition = DBA::mergeConditions($condition, $condition = DBA::mergeConditions($condition,
["NOT `self` AND NOT `blocked` AND `notify` != ? AND `contact-type` = ?", '', Contact::TYPE_COMMUNITY ["NOT `self` AND NOT `blocked` AND `notify` != ? AND `contact-type` = ?", '', Contact::TYPE_COMMUNITY
]); ]);
break; break;
case self::TYPE_PRIVATE_MESSAGE: case self::TYPE_PRIVATE_MESSAGE:
$condition = DBA::mergeConditions($condition, $condition = DBA::mergeConditions($condition,
["NOT `self` AND NOT `blocked` AND `notify` != ? AND `network` IN (?, ?, ?)", '', Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA ["NOT `self` AND NOT `blocked` AND `notify` != ? AND `network` IN (?, ?, ?)", '', Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA
]); ]);
break; break;
} }
$contact_count = DBA::count('contact', $condition); $contact_count = $this->database->count('contact', $condition);
$tot = $group_count + $contact_count; $resultTotal = $group_count + $contact_count;
$groups = []; $resultGroups = [];
$contacts = []; $resultContacts = [];
if ($type == self::TYPE_MENTION_CONTACT_GROUP || $type == self::TYPE_MENTION_GROUP) { if ($type == self::TYPE_MENTION_CONTACT_GROUP || $type == self::TYPE_MENTION_GROUP) {
/// @todo We should cache this query. /// @todo We should cache this query.
// This can be done when we can delete cache entries via wildcard // This can be done when we can delete cache entries via wildcard
$r = DBA::toArray(DBA::p("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') AS uids $groups = $this->database->toArray($this->database->p("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') AS uids
FROM `group` FROM `group`
INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id` INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id`
WHERE NOT `group`.`deleted` AND `group`.`uid` = ? WHERE NOT `group`.`deleted` AND `group`.`uid` = ?
@ -176,66 +192,66 @@ class Acl extends BaseModule
GROUP BY `group`.`name`, `group`.`id` GROUP BY `group`.`name`, `group`.`id`
ORDER BY `group`.`name` ORDER BY `group`.`name`
LIMIT ?, ?", LIMIT ?, ?",
DI::userSession()->getLocalUserId(), $this->session->getLocalUserId(),
$start, $start,
$count $count
)); ));
foreach ($r as $g) { foreach ($groups as $group) {
$groups[] = [ $resultGroups[] = [
'type' => 'g', 'type' => 'g',
'photo' => 'images/twopeople.png', 'photo' => 'images/twopeople.png',
'name' => htmlspecialchars($g['name']), 'name' => htmlspecialchars($group['name']),
'id' => intval($g['id']), 'id' => intval($group['id']),
'uids' => array_map('intval', explode(',', $g['uids'])), 'uids' => array_map('intval', explode(',', $group['uids'])),
'link' => '', 'link' => '',
'forum' => '0' 'forum' => '0'
]; ];
} }
if ((count($groups) > 0) && ($search == '')) { if ((count($resultGroups) > 0) && ($search == '')) {
$groups[] = ['separator' => true]; $resultGroups[] = ['separator' => true];
} }
} }
$r = []; $contacts = [];
if ($type != self::TYPE_MENTION_GROUP) { if ($type != self::TYPE_MENTION_GROUP) {
$r = Contact::selectToArray([], $condition, ['order' => ['name']]); $contacts = Contact::selectToArray([], $condition, ['order' => ['name']]);
} }
if (DBA::isResult($r)) { $forums = [];
$forums = []; foreach ($contacts as $contact) {
foreach ($r as $g) { $entry = [
$entry = [ 'type' => 'c',
'type' => 'c', 'photo' => Contact::getMicro($contact, true),
'photo' => Contact::getMicro($g, true), 'name' => htmlspecialchars($contact['name']),
'name' => htmlspecialchars($g['name']), 'id' => intval($contact['id']),
'id' => intval($g['id']), 'network' => $contact['network'],
'network' => $g['network'], 'link' => $contact['url'],
'link' => $g['url'], 'nick' => htmlentities(($contact['attag'] ?? '') ?: $contact['nick']),
'nick' => htmlentities(($g['attag'] ?? '') ?: $g['nick']), 'addr' => htmlentities(($contact['addr'] ?? '') ?: $contact['url']),
'addr' => htmlentities(($g['addr'] ?? '') ?: $g['url']), 'forum' => $contact['contact-type'] == Contact::TYPE_COMMUNITY,
'forum' => $g['contact-type'] == Contact::TYPE_COMMUNITY, ];
]; if ($entry['forum']) {
if ($entry['forum']) { $forums[] = $entry;
$forums[] = $entry; } else {
} else { $resultContacts[] = $entry;
$contacts[] = $entry;
}
}
if (count($forums) > 0) {
if ($search == '') {
$forums[] = ['separator' => true];
}
$contacts = array_merge($forums, $contacts);
} }
} }
$items = array_merge($groups, $contacts); if ($forums) {
if ($search == '') {
$forums[] = ['separator' => true];
}
$resultContacts = array_merge($forums, $resultContacts);
}
$resultItems = array_merge($resultGroups, $resultContacts);
if ($conv_id) { if ($conv_id) {
// In multi threaded posts the conv_id is not the parent of the whole thread // In multithreaded posts the conv_id is not the parent of the whole thread
$parent_item = Post::selectFirst(['parent'], ['id' => $conv_id]); $parent_item = Post::selectFirst(['parent'], ['id' => $conv_id]);
if (DBA::isResult($parent_item)) { if ($parent_item) {
$conv_id = $parent_item['parent']; $conv_id = $parent_item['parent'];
} }
@ -243,29 +259,23 @@ class Acl extends BaseModule
* if $conv_id is set, get unknown contacts in thread * if $conv_id is set, get unknown contacts in thread
* but first get known contacts url to filter them out * but first get known contacts url to filter them out
*/ */
$known_contacts = array_map(function ($i) { $known_contacts = array_column($resultContacts, 'link');
return $i['link'];
}, $contacts);
$unknown_contacts = []; $unknown_contacts = [];
$condition = ["`parent` = ?", $conv_id]; $condition = ["`parent` = ?", $conv_id];
$params = ['order' => ['author-name' => true]]; $params = ['order' => ['author-name' => true]];
$authors = Post::selectForUser(DI::userSession()->getLocalUserId(), ['author-link'], $condition, $params); $authors = Post::selectForUser($this->session->getLocalUserId(), ['author-link'], $condition, $params);
$item_authors = []; $item_authors = [];
while ($author = Post::fetch($authors)) { while ($author = Post::fetch($authors)) {
$item_authors[$author['author-link']] = $author['author-link']; $item_authors[$author['author-link']] = $author['author-link'];
} }
DBA::close($authors);
foreach ($item_authors as $author) { $this->database->close($authors);
if (in_array($author, $known_contacts)) {
continue;
}
foreach (array_diff($item_authors, $known_contacts) as $author) {
$contact = Contact::getByURL($author, false, ['micro', 'name', 'id', 'network', 'nick', 'addr', 'url', 'forum', 'avatar']); $contact = Contact::getByURL($author, false, ['micro', 'name', 'id', 'network', 'nick', 'addr', 'url', 'forum', 'avatar']);
if ($contact) {
if (count($contact) > 0) {
$unknown_contacts[] = [ $unknown_contacts[] = [
'type' => 'c', 'type' => 'c',
'photo' => Contact::getMicro($contact, true), 'photo' => Contact::getMicro($contact, true),
@ -280,17 +290,17 @@ class Acl extends BaseModule
} }
} }
$items = array_merge($items, $unknown_contacts); $resultItems = array_merge($resultItems, $unknown_contacts);
$tot += count($unknown_contacts); $resultTotal += count($unknown_contacts);
} }
$results = [ $results = [
'tot' => $tot, 'tot' => $resultTotal,
'start' => $start, 'start' => $start,
'count' => $count, 'count' => $count,
'groups' => $groups, 'groups' => $resultGroups,
'contacts' => $contacts, 'contacts' => $resultContacts,
'items' => $items, 'items' => $resultItems,
'type' => $type, 'type' => $type,
'search' => $search, 'search' => $search,
]; ];
@ -304,7 +314,7 @@ class Acl extends BaseModule
'items' => $results['items'], 'items' => $results['items'],
]; ];
Logger::info('ACL {action} - {subaction} - done', ['module' => 'acl', 'action' => 'content', 'subaction' => 'search', 'search' => $search, 'type' => $type, 'conversation' => $conv_id]); $this->logger->info('ACL {action} - {subaction} - done', ['module' => 'acl', 'action' => 'content', 'subaction' => 'search', 'search' => $search, 'type' => $type, 'conversation' => $conv_id]);
return $o; return $o;
} }
} }