1 files changed, 30 insertions, 17 deletions

diff --git a/apps/comments/lib/Search/Provider.php b/apps/comments/lib/Search/Provider.php
index 78442e3ce0b..ac5afef6669 100644
--- a/apps/comments/lib/Search/Provider.php
+++ b/apps/comments/lib/Search/Provider.php
@@ -50,27 +50,40 @@ class Provider extends \OCP\Search\Provider {
 			return [];
 		}
 
-		/** @var IComment[] $comments */
-		$comments = $cm->search($query, 'files', '', 'comment');
-
 		$result = [];
-		foreach ($comments as $comment) {
-			if ($comment->getActorType() !== 'users') {
-				continue;
+		$numComments = 50;
+		$offset = 0;
+
+		while (\count($result) < $numComments) {
+			/** @var IComment[] $comments */
+			$comments = $cm->search($query, 'files', '', 'comment', $offset, $numComments);
+
+			foreach ($comments as $comment) {
+				if ($comment->getActorType() !== 'users') {
+					continue;
+				}
+
+				$displayName = $cm->resolveDisplayName('user', $comment->getActorId());
+
+				try {
+					$file = $this->getFileForComment($uf, $comment);
+					$result[] = new Result($query,
+						$comment,
+						$displayName,
+						$file->getPath()
+					);
+				} catch (NotFoundException $e) {
+					continue;
+				}
 			}
 
-			$displayName = $cm->resolveDisplayName('user', $comment->getActorId());
-
-			try {
-				$file = $this->getFileForComment($uf, $comment);
-				$result[] = new Result($query,
-					$comment,
-					$displayName,
-					$file->getPath()
-				);
-			} catch (NotFoundException $e) {
-				continue;
+			if (\count($comments) < $numComments) {
+				// Didn't find more comments when we tried to get, so there are no more comments.
+				return $result;
 			}
+
+			$offset += $numComments;
+			$numComments = 50 - \count($result);
 		}
 
 		return $result;