opensourcemirror
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #22057 from nextcloud/fix/20009/contactsmenu-limit-users 

contactsmanager shall limit number of results early
This commit is contained in:
Morris Jobke 2020-08-03 15:15:46 +02:00 committed by GitHub
parent b585aefcea 7c56283c3c
commit 489fecac32
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
* @return IEntry[]
*/
public function getContacts(IUser $user, $filter) {
$allContacts = $this->contactsManager->search($filter ?: '', [
'FN',
'EMAIL'
]);
public function getContacts(IUser $user, $filter, ?int $limit = null, ?int $offset = null) {
$options = [];
if ($limit !== null) {
$options['limit'] = $limit;
}
if ($offset !== null) {
$options['offset'] = $offset;
}
$allContacts = $this->contactsManager->search(
$filter ?: '',
[
'FN',
'EMAIL'
],
$options
);
$entries = array_map(function (array $contact) {
return $this->contactArrayToEntry($contact);
@ -122,7 +134,7 @@ class ContactsStore implements IContactsStore {
if ($excludedGroups) {
$excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
$decodedExcludeGroups = json_decode($excludedGroups, true);
$excludeGroupsList = ($decodedExcludeGroups !== null) ? $decodedExcludeGroups : [];
$excludeGroupsList = ($decodedExcludeGroups !== null) ? $decodedExcludeGroups : [];
if (count(array_intersect($excludeGroupsList, $selfGroups)) !== 0) {
// 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);
$topEntries = [];
if (strlen($filter) >= $minSearchStringLength) {
$entries = $this->store->getContacts($user, $filter);
$entries = $this->store->getContacts($user, $filter, $maxAutocompleteResults);
$sortedEntries = $this->sortEntries($entries);
$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 $filter
* @param string $filter
* @param int $limit added 19.0.2
* @param int $offset added 19.0.2
* @return IEntry[]
* @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)