diff --git a/composer.lock b/composer.lock index 1433264b568..6641373d15c 100644 --- a/composer.lock +++ b/composer.lock @@ -258,12 +258,12 @@ "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "e2fc12d2747886faabf2f1edd69fb19b0873e00a" + "reference": "42db7cb19d58d207ae0bc16d616d957bdb1c9fee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/e2fc12d2747886faabf2f1edd69fb19b0873e00a", - "reference": "e2fc12d2747886faabf2f1edd69fb19b0873e00a", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/42db7cb19d58d207ae0bc16d616d957bdb1c9fee", + "reference": "42db7cb19d58d207ae0bc16d616d957bdb1c9fee", "shasum": "" }, "require": { @@ -295,7 +295,7 @@ "issues": "https://github.com/nextcloud-deps/ocp/issues", "source": "https://github.com/nextcloud-deps/ocp/tree/master" }, - "time": "2023-11-11T00:31:29+00:00" + "time": "2023-11-17T00:33:21+00:00" }, { "name": "psr/clock", diff --git a/lib/Search/MessageSearch.php b/lib/Search/MessageSearch.php index 077ab73b5d7..3392addc788 100644 --- 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, ]; }