mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22091 from nextcloud/backport/22057/stable19 

[stable19] contactsmanager shall limit number of results early
This commit is contained in:
blizzz 2020-08-03 17:54:40 +02:00 committed by GitHub
parent 9d56c5142b dc98aaa224
commit 7a1bd4e8a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/private/Contacts/ContactsMenu/ContactsStore.php
View File

@ -73,11 +73,23 @@ class ContactsStore implements IContactsStore {
* @param string|null $filter * @param string|null $filter
* @return IEntry[] * @return IEntry[]
*/ */
public function getContacts(IUser $user, $filter) { public function getContacts(IUser $user, $filter, ?int $limit = null, ?int $offset = null) {
$allContacts = $this->contactsManager->search($filter ?: '', [ $options = [];
'FN', if ($limit !== null) {
'EMAIL' $options['limit'] = $limit;
]); }
if ($offset !== null) {
$options['offset'] = $offset;
}
$allContacts = $this->contactsManager->search(
$filter ?: '',
[
'FN',
'EMAIL'
],
$options
);
$entries = array_map(function (array $contact) { $entries = array_map(function (array $contact) {
return $this->contactArrayToEntry($contact); return $this->contactArrayToEntry($contact);
@ -122,7 +134,7 @@ class ContactsStore implements IContactsStore {
if ($excludedGroups) { if ($excludedGroups) {
$excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', ''); $excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
$decodedExcludeGroups = json_decode($excludedGroups, true); $decodedExcludeGroups = json_decode($excludedGroups, true);
$excludeGroupsList = ($decodedExcludeGroups !== null) ? $decodedExcludeGroups : []; $excludeGroupsList = ($decodedExcludeGroups !== null) ? $decodedExcludeGroups : [];
if (count(array_intersect($excludeGroupsList, $selfGroups)) !== 0) { if (count(array_intersect($excludeGroupsList, $selfGroups)) !== 0) {
// a group of the current user is excluded -> filter all local users // a group of the current user is excluded -> filter all local users

2
lib/private/Contacts/ContactsMenu/Manager.php
View File

@ -66,7 +66,7 @@ class Manager {
$minSearchStringLength = $this->config->getSystemValueInt('sharing.minSearchStringLength', 0); $minSearchStringLength = $this->config->getSystemValueInt('sharing.minSearchStringLength', 0);
$topEntries = []; $topEntries = [];
if (strlen($filter) >= $minSearchStringLength) { if (strlen($filter) >= $minSearchStringLength) {
$entries = $this->store->getContacts($user, $filter); $entries = $this->store->getContacts($user, $filter, $maxAutocompleteResults);
$sortedEntries = $this->sortEntries($entries); $sortedEntries = $this->sortEntries($entries);
$topEntries = array_slice($sortedEntries, 0, $maxAutocompleteResults); $topEntries = array_slice($sortedEntries, 0, $maxAutocompleteResults);

6
lib/public/Contacts/ContactsMenu/IContactsStore.php
View File

@ -33,11 +33,13 @@ interface IContactsStore {
/** /**
* @param IUser $user * @param IUser $user
* @param $filter * @param string $filter
* @param int $limit added 19.0.2
* @param int $offset added 19.0.2
* @return IEntry[] * @return IEntry[]
* @since 13.0.0 * @since 13.0.0
*/ */
public function getContacts(IUser $user, $filter); public function getContacts(IUser $user, $filter, ?int $limit = null, ?int $offset = null);
/** /**
* @brief finds a contact by specifying the property to search on ($shareType) and the value ($shareWith) * @brief finds a contact by specifying the property to search on ($shareType) and the value ($shareWith)