Merge pull request #8206 from nextcloud/bugfix/noid/fix-collaboration…

…-result-size Better result handling of email search
nextcloud · Feb 20, 2018 · 8e5120c · 8e5120c
2 parents cf83eb5 + b30e035
commit 8e5120c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/lib/private/Collaboration/Collaborators/MailPlugin.php b/lib/private/Collaboration/Collaborators/MailPlugin.php
@@ -175,6 +175,8 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 
 		if (!$this->shareeEnumeration) {
 			$result['wide'] = [];
+		} else {
+			$result['wide'] = array_slice($result['wide'], $offset, $limit);
 		}
 
 		if (!$searchResult->hasExactIdMatch($emailType) && filter_var($search, FILTER_VALIDATE_EMAIL)) {

diff --git a/lib/private/Collaboration/Collaborators/RemotePlugin.php b/lib/private/Collaboration/Collaborators/RemotePlugin.php
@@ -102,6 +102,8 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 
 		if (!$this->shareeEnumeration) {
 			$result['wide'] = [];
+		} else {
+			$result['wide'] = array_slice($result['wide'], $offset, $limit);
 		}
 
 		if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {

diff --git a/tests/lib/Collaboration/Collaborators/MailPluginTest.php b/tests/lib/Collaboration/Collaborators/MailPluginTest.php
@@ -103,7 +103,7 @@ function($appName, $key, $default)
 			->with($searchTerm, ['EMAIL', 'FN'])
 			->willReturn($contacts);
 
-		$moreResults = $this->plugin->search($searchTerm, 0, 0, $this->searchResult);
+		$moreResults = $this->plugin->search($searchTerm, 2, 0, $this->searchResult);
 		$result = $this->searchResult->asArray();
 
 		$this->assertSame($exactIdMatch, $this->searchResult->hasExactIdMatch(new SearchResultType('emails')));
@@ -398,7 +398,7 @@ function($appName, $key, $default) {
 				return in_array($group, $userToGroupMapping[$userId]);
 			});
 
-		$moreResults = $this->plugin->search($searchTerm, 0, 0, $this->searchResult);
+		$moreResults = $this->plugin->search($searchTerm, 2, 0, $this->searchResult);
 		$result = $this->searchResult->asArray();
 
 		$this->assertSame($exactIdMatch, $this->searchResult->hasExactIdMatch(new SearchResultType('emails')));

diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
@@ -94,7 +94,7 @@ function($appName, $key, $default)
 			->with($searchTerm, ['CLOUD', 'FN'])
 			->willReturn($contacts);
 
-		$moreResults = $this->plugin->search($searchTerm, 0, 0, $this->searchResult);
+		$moreResults = $this->plugin->search($searchTerm, 2, 0, $this->searchResult);
 		$result = $this->searchResult->asArray();
 
 		$this->assertSame($exactIdMatch, $this->searchResult->hasExactIdMatch(new SearchResultType('remotes')));