Merge pull request #10919 from nextcloud/bugfix/noid/use-OCP-constant…

…s-for-filters fix(search): Use OCP constants for filters
nextcloud · Nov 17, 2023 · 6fdfabb · 6fdfabb
2 parents 07dcc76 + 1ceb3ee
commit 6fdfabb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Search/MessageSearch.php b/lib/Search/MessageSearch.php
@@ -38,6 +38,7 @@
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUser;
+use OCP\Search\IFilter;
 use OCP\Search\IFilteringProvider;
 use OCP\Search\IProvider;
 use OCP\Search\ISearchQuery;
@@ -140,19 +141,19 @@ public function performSearch(IUser $user, ISearchQuery $query, string $title, a
 
 		// Apply filters when available
 		$lowerTimeBoundary = $upperTimeBoundary = $actorType = $actorId = null;
-		if ($since = $query->getFilter('since')?->get()) {
+		if ($since = $query->getFilter(IFilter::BUILTIN_SINCE)?->get()) {
 			if ($since instanceof \DateTimeImmutable) {
 				$lowerTimeBoundary = $since;
 			}
 		}
 
-		if ($until = $query->getFilter('until')?->get()) {
+		if ($until = $query->getFilter(IFilter::BUILTIN_UNTIL)?->get()) {
 			if ($until instanceof \DateTimeImmutable) {
 				$upperTimeBoundary = $until;
 			}
 		}
 
-		if ($person = $query->getFilter('person')?->get()) {
+		if ($person = $query->getFilter(IFilter::BUILTIN_PERSON)?->get()) {
 			if ($person instanceof IUser) {
 				$actorType = Attendee::ACTOR_USERS;
 				$actorId = $person->getUID();
@@ -271,10 +272,10 @@ protected function commentToSearchResultEntry(Room $room, IUser $user, IComment
 
 	public function getSupportedFilters(): array {
 		return [
-			'term',
-			'since',
-			'until',
-			'person',
+			IFilter::BUILTIN_TERM,
+			IFilter::BUILTIN_SINCE,
+			IFilter::BUILTIN_UNTIL,
+			IFilter::BUILTIN_PERSON,
 		];
 	}