feat(search): Allow multiple search terms in UnifiedController

Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>

13 files changed, 758 insertions, 88 deletions

diff --git a/lib/private/Search/Filter/BooleanFilter.php b/lib/private/Search/Filter/BooleanFilter.php
new file mode 100644
index 00000000000..a64bf17f31c
--- /dev/null
+++ b/lib/private/Search/Filter/BooleanFilter.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2023 Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @author Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Search\Filter;
+
+use InvalidArgumentException;
+use OCP\Search\IFilter;
+
+class BooleanFilter implements IFilter {
+	private bool $value;
+
+	public function __construct(string $value) {
+		$this->value = match ($value) {
+			'true', 'yes', 'y', '1' => true,
+			'false', 'no', 'n', '0', '' => false,
+			default => throw new InvalidArgumentException('Invalid boolean value '. $value),
+		};
+	}
+
+	public function get(): bool {
+		return $this->value;
+	}
+}
diff --git a/lib/private/Search/Filter/DateTimeFilter.php b/lib/private/Search/Filter/DateTimeFilter.php
new file mode 100644
index 00000000000..79abf9ad542
--- /dev/null
+++ b/lib/private/Search/Filter/DateTimeFilter.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2023 Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @author Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Search\Filter;
+
+use DateTimeImmutable;
+use OCP\Search\IFilter;
+
+class DateTimeFilter implements IFilter {
+	private DateTimeImmutable $value;
+
+	public function __construct(string $value) {
+		if (filter_var($value, FILTER_VALIDATE_INT)) {
+			$value = '@'.$value;
+		}
+
+		$this->value = new DateTimeImmutable($value);
+	}
+
+	public function get(): DateTimeImmutable {
+		return $this->value;
+	}
+}
diff --git a/lib/private/Search/Filter/FloatFilter.php b/lib/private/Search/Filter/FloatFilter.php
new file mode 100644
index 00000000000..3db19ded59b
--- /dev/null
+++ b/lib/private/Search/Filter/FloatFilter.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2023 Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @author Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Search\Filter;
+
+use InvalidArgumentException;
+use OCP\Search\IFilter;
+
+class FloatFilter implements IFilter {
+	private float $value;
+
+	public function __construct(string $value) {
+		$this->value = filter_var($value, FILTER_VALIDATE_FLOAT);
+		if ($this->value === false) {
+			throw new InvalidArgumentException('Invalid float value '. $value);
+		}
+	}
+
+	public function get(): float {
+		return $this->value;
+	}
+}
diff --git a/lib/private/Search/Filter/GroupFilter.php b/lib/private/Search/Filter/GroupFilter.php
new file mode 100644
index 00000000000..6b42492824c
--- /dev/null
+++ b/lib/private/Search/Filter/GroupFilter.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2023 Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @author Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Search\Filter;
+
+use InvalidArgumentException;
+use OCP\IGroup;
+use OCP\IGroupManager;
+use OCP\Search\IFilter;
+
+class GroupFilter implements IFilter {
+	private IGroup $group;
+
+	public function __construct(
+		string $value,
+		IGroupManager $groupManager,
+	) {
+		$this->group = $groupManager->get($value);
+		if ($this->group === null) {
+			throw new InvalidArgumentException('Group '.$value.' not found');
+		}
+	}
+
+	public function get(): IGroup {
+		return $this->group;
+	}
+}
diff --git a/lib/private/Search/Filter/IntegerFilter.php b/lib/private/Search/Filter/IntegerFilter.php
new file mode 100644
index 00000000000..b5b907b220e
--- /dev/null
+++ b/lib/private/Search/Filter/IntegerFilter.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2023 Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @author Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Search\Filter;
+
+use InvalidArgumentException;
+use OCP\Search\IFilter;
+
+class IntegerFilter implements IFilter {
+	private int $value;
+
+	public function __construct(string $value) {
+		$this->value = filter_var($value, FILTER_VALIDATE_INT);
+		if ($this->value === false) {
+			throw new InvalidArgumentException('Invalid integer value '. $value);
+		}
+	}
+
+	public function get(): int {
+		return $this->value;
+	}
+}
diff --git a/lib/private/Search/Filter/StringFilter.php b/lib/private/Search/Filter/StringFilter.php
new file mode 100644
index 00000000000..8f754d12051
--- /dev/null
+++ b/lib/private/Search/Filter/StringFilter.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2023 Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @author Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Search\Filter;
+
+use InvalidArgumentException;
+use OCP\Search\IFilter;
+
+class StringFilter implements IFilter {
+	public function __construct(
+		private string $value,
+	) {
+		if ($value === '') {
+			throw new InvalidArgumentException('String filter can’t be empty');
+		}
+	}
+
+	public function get(): string {
+		return $this->value;
+	}
+}
diff --git a/lib/private/Search/Filter/StringsFilter.php b/lib/private/Search/Filter/StringsFilter.php
new file mode 100644
index 00000000000..7a8d88768e8
--- /dev/null
+++ b/lib/private/Search/Filter/StringsFilter.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2023 Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @author Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Search\Filter;
+
+use InvalidArgumentException;
+use OCP\Search\IFilter;
+
+class StringsFilter implements IFilter {
+	/**
+	 * @var string[]
+	 */
+	private array $values;
+
+	public function __construct(string ...$values) {
+		$this->values = array_unique(array_filter($values));
+		if (empty($this->values)) {
+			throw new InvalidArgumentException('Strings filter can’t be empty');
+		}
+	}
+
+	/**
+	 * @return string[]
+	 */
+	public function get(): array {
+		return $this->values;
+	}
+}
diff --git a/lib/private/Search/Filter/UserFilter.php b/lib/private/Search/Filter/UserFilter.php
new file mode 100644
index 00000000000..1624b60d1a3
--- /dev/null
+++ b/lib/private/Search/Filter/UserFilter.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2023 Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @author Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Search\Filter;
+
+use InvalidArgumentException;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\Search\IFilter;
+
+class UserFilter implements IFilter {
+	private IUser $user;
+
+	public function __construct(
+		string $value,
+		IUserManager $userManager,
+	) {
+		$this->user = $userManager->get($value);
+		if ($this->user === null) {
+			throw new InvalidArgumentException('User '.$value.' not found');
+		}
+	}
+
+	public function get(): IUser {
+		return $this->user;
+	}
+}
diff --git a/lib/private/Search/FilterCollection.php b/lib/private/Search/FilterCollection.php
new file mode 100644
index 00000000000..8c23cc7c110
--- /dev/null
+++ b/lib/private/Search/FilterCollection.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2023 Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @author Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OC\Search;
+
+use Generator;
+use OCP\Search\IFilterCollection;
+use OCP\Search\IFilter;
+
+/**
+ * Interface for search filters
+ *
+ * @since 28.0.0
+ */
+class FilterCollection implements IFilterCollection {
+	/**
+	 * @var IFilter[]
+	 */
+	private array $filters;
+
+	public function __construct(IFilter ...$filters) {
+		$this->filters = $filters;
+	}
+
+	public function has(string $name): bool {
+		return isset($this->filters[$name]);
+	}
+
+	public function get(string $name): ?IFilter {
+		return $this->filters[$name] ?? null;
+	}
+
+	public function getIterator(): Generator {
+		foreach ($this->filters as $k => $v) {
+			yield $k => $v;
+		}
+	}
+}
diff --git a/lib/private/Search/FilterFactory.php b/lib/private/Search/FilterFactory.php
new file mode 100644
index 00000000000..19afb2c04be
--- /dev/null
+++ b/lib/private/Search/FilterFactory.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2023 Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @author Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OC\Search;
+
+use OCP\Search\FilterDefinition;
+use OCP\Search\IFilter;
+use OCP\IGroupManager;
+use OCP\IUserManager;
+use RuntimeException;
+
+final class FilterFactory {
+	public static function get(string $type, string|array $filter): IFilter {
+		return match ($type) {
+			FilterDefinition::TYPE_BOOL => new Filter\BooleanFilter($filter),
+			FilterDefinition::TYPE_DATETIME => new Filter\DateTimeFilter($filter),
+			FilterDefinition::TYPE_FLOAT => new Filter\FloatFilter($filter),
+			FilterDefinition::TYPE_INT => new Filter\IntegerFilter($filter),
+			FilterDefinition::TYPE_NC_GROUP => new Filter\GroupFilter($filter, \OC::$server->get(IGroupManager::class)),
+			FilterDefinition::TYPE_NC_USER => new Filter\UserFilter($filter, \OC::$server->get(IUserManager::class)),
+			FilterDefinition::TYPE_PERSON => self::getPerson($filter),
+			FilterDefinition::TYPE_STRING => new Filter\StringFilter($filter),
+			FilterDefinition::TYPE_STRINGS => new Filter\StringsFilter(... (array) $filter),
+			default => throw new RuntimeException('Invalid filter type '. $type),
+		};
+	}
+
+	private static function getPerson(string $person): IFilter {
+		$parts = explode('_', $person, 2);
+
+		return match (count($parts)) {
+			1 => self::get(FilterDefinition::TYPE_NC_USER, $person),
+			2 => self::get(... $parts),
+		};
+	}
+}
diff --git a/lib/private/Search/SearchComposer.php b/lib/private/Search/SearchComposer.php
index 4ec73ec54e9..41d969ca90b 100644
--- a/lib/private/Search/SearchComposer.php
+++ b/lib/private/Search/SearchComposer.php
@@ -28,14 +28,19 @@ declare(strict_types=1);
 namespace OC\Search;
 
 use InvalidArgumentException;
-use OCP\AppFramework\QueryException;
-use OCP\IServerContainer;
+use OCP\IURLGenerator;
+use OCP\Search\FilterDefinition;
+use OCP\Search\IFilteringProvider;
+use OC\AppFramework\Bootstrap\Coordinator;
 use OCP\IUser;
+use OCP\Search\IFilter;
 use OCP\Search\IProvider;
 use OCP\Search\ISearchQuery;
 use OCP\Search\SearchResult;
-use OC\AppFramework\Bootstrap\Coordinator;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
+use RuntimeException;
 use function array_map;
 
 /**
@@ -58,31 +63,40 @@ use function array_map;
  * @see IProvider::search() for the arguments of the individual search requests
  */
 class SearchComposer {
-	/** @var IProvider[] */
-	private $providers = [];
-
-	/** @var Coordinator */
-	private $bootstrapCoordinator;
+	/**
+	 * @var array<string, array{appId: string, provider: IProvider}>
+	 */
+	private array $providers = [];
 
-	/** @var IServerContainer */
-	private $container;
+	private array $commonFilters;
+	private array $customFilters = [];
 
-	private LoggerInterface $logger;
+	private array $handlers = [];
 
-	public function __construct(Coordinator $bootstrapCoordinator,
-								IServerContainer $container,
-								LoggerInterface $logger) {
-		$this->container = $container;
-		$this->logger = $logger;
-		$this->bootstrapCoordinator = $bootstrapCoordinator;
+	public function __construct(
+		private Coordinator $bootstrapCoordinator,
+		private ContainerInterface $container,
+		private IURLGenerator $urlGenerator,
+		private LoggerInterface $logger
+	) {
+		$this->commonFilters = [
+			'term' => new FilterDefinition('term', FilterDefinition::TYPE_STRING),
+			'since' => new FilterDefinition('since', FilterDefinition::TYPE_DATETIME),
+			'until' => new FilterDefinition('until', FilterDefinition::TYPE_DATETIME),
+			'title-only' => new FilterDefinition('title-only', FilterDefinition::TYPE_BOOL, false),
+			'person' => new FilterDefinition('person', FilterDefinition::TYPE_PERSON),
+			'places' => new FilterDefinition('places', FilterDefinition::TYPE_STRINGS, false),
+			'provider' => new FilterDefinition('provider', FilterDefinition::TYPE_STRING, false),
+		];
 	}
 
 	/**
 	 * Load all providers dynamically that were registered through `registerProvider`
 	 *
+	 * If $targetProviderId is provided, only this provider is loaded
 	 * If a provider can't be loaded we log it but the operation continues nevertheless
 	 */
-	private function loadLazyProviders(): void {
+	private function loadLazyProviders(?string $targetProviderId = null): void {
 		$context = $this->bootstrapCoordinator->getRegistrationContext();
 		if ($context === null) {
 			// Too early, nothing registered yet
@@ -93,9 +107,20 @@ class SearchComposer {
 		foreach ($registrations as $registration) {
 			try {
 				/** @var IProvider $provider */
-				$provider = $this->container->query($registration->getService());
-				$this->providers[$provider->getId()] = $provider;
-			} catch (QueryException $e) {
+				$provider = $this->container->get($registration->getService());
+				$providerId = $provider->getId();
+				if ($targetProviderId !== null && $targetProviderId !== $providerId) {
+					continue;
+				}
+				$this->providers[$providerId] = [
+					'appId' => $registration->getAppId(),
+					'provider' => $provider,
+				];
+				$this->handlers[$providerId] = [$providerId];
+				if ($targetProviderId !== null) {
+					break;
+				}
+			} catch (ContainerExceptionInterface $e) {
 				// Log an continue. We can be fault tolerant here.
 				$this->logger->error('Could not load search provider dynamically: ' . $e->getMessage(), [
 					'exception' => $e,
@@ -103,6 +128,43 @@ class SearchComposer {
 				]);
 			}
 		}
+
+		$this->loadFilters();
+	}
+
+	private function loadFilters(): void {
+		foreach ($this->providers as $providerId => $providerData) {
+			$appId = $providerData['appId'];
+			$provider = $providerData['provider'];
+			if (!$provider instanceof IFilteringProvider) {
+				continue;
+			}
+
+			foreach ($provider->getCustomFilters() as $filter) {
+				$this->registerCustomFilter($filter, $providerId);
+			}
+			foreach ($provider->getAlternateIds() as $alternateId) {
+				$this->handlers[$alternateId][] = $providerId;
+			}
+			foreach ($provider->getSupportedFilters() as $filterName) {
+				if ($this->getFilterDefinition($filterName, $providerId) === null) {
+					throw new InvalidArgumentException('Invalid filter '. $filterName);
+				}
+			}
+		}
+	}
+
+	private function registerCustomFilter(FilterDefinition $filter, string $providerId): void {
+		$name = $filter->name();
+		if (isset($this->commonFilters[$name])) {
+			throw new InvalidArgumentException('Filter name is already used');
+		}
+
+		if (isset($this->customFilters[$providerId])) {
+			$this->customFilters[$providerId][$name] = $filter;
+		} else {
+			$this->customFilters[$providerId] = [$name => $filter];
+		}
 	}
 
 	/**
@@ -117,26 +179,134 @@ class SearchComposer {
 	public function getProviders(string $route, array $routeParameters): array {
 		$this->loadLazyProviders();
 
-		$providers = array_values(
-			array_map(function (IProvider $provider) use ($route, $routeParameters) {
+		$providers = array_map(
+			function (array $providerData) use ($route, $routeParameters) {
+				$appId = $providerData['appId'];
+				$provider = $providerData['provider'];
+				$triggers = [$provider->getId()];
+				if ($provider instanceof IFilteringProvider) {
+					$triggers += $provider->getAlternateIds();
+					$filters = $provider->getSupportedFilters();
+				} else {
+					$filters = ['term'];
+				}
+
 				return [
 					'id' => $provider->getId(),
+					'appId' => $appId,
 					'name' => $provider->getName(),
+					'icon' => $this->fetchIcon($appId, $provider->getId()),
 					'order' => $provider->getOrder($route, $routeParameters),
+					'triggers' => $triggers,
+					'filters' => $this->getFiltersType($filters, $provider->getId()),
 				];
-			}, $this->providers)
+			},
+			$this->providers,
 		);
 
+		// Sort providers by order and strip associative keys
 		usort($providers, function ($provider1, $provider2) {
 			return $provider1['order'] <=> $provider2['order'];
 		});
 
-		/**
-		 * Return an array with the IDs, but strip the associative keys
-		 */
 		return $providers;
 	}
 
+	private function fetchIcon(string $appId, string $providerId): string {
+		$icons = [
+			[$providerId, $providerId.'.svg'],
+			[$providerId, 'app.svg'],
+			[$appId, $providerId.'.svg'],
+			[$appId, $appId.'.svg'],
+			[$appId, 'app.svg'],
+			['core', 'places/default-app-icon.svg'],
+		];
+		foreach ($icons as $i => $icon) {
+			try {
+				return $this->urlGenerator->imagePath(... $icon);
+			} catch (RuntimeException $e) {
+				// Ignore error
+			}
+		}
+
+		return '';
+	}
+
+	/**
+	 * @param $filters string[]
+	 * @return array<string, string>
+	 */
+	private function getFiltersType(array $filters, string $providerId): array {
+		$filterList = [];
+		foreach ($filters as $filter) {
+			$filterList[$filter] = $this->getFilterDefinition($filter, $providerId)->type();
+		}
+
+		return $filterList;
+	}
+
+	private function getFilterDefinition(string $name, string $providerId): ?FilterDefinition {
+		if (isset($this->commonFilters[$name])) {
+			return $this->commonFilters[$name];
+		}
+		if (isset($this->customFilters[$providerId][$name])) {
+			return $this->customFilters[$providerId][$name];
+		}
+
+		return null;
+	}
+
+	/**
+	 * @param array<string, string> $parameters
+	 */
+	public function buildFilterList(string $providerId, array $parameters): FilterCollection {
+		$this->loadLazyProviders($providerId);
+
+		$list = [];
+		foreach ($parameters as $name => $value) {
+			$filter = $this->buildFilter($name, $value, $providerId);
+			if ($filter === null) {
+				continue;
+			}
+			$list[$name] = $filter;
+		}
+
+		return new FilterCollection(... $list);
+	}
+
+	private function buildFilter(string $name, string $value, string $providerId): ?IFilter {
+		$filterDefinition = $this->getFilterDefinition($name, $providerId);
+		if ($filterDefinition === null) {
+			$this->logger->debug('Unable to find {name} definition', [
+				'name' => $name,
+				'value' => $value,
+			]);
+
+			return null;
+		}
+
+		if (!$this->filterSupportedByProvider($filterDefinition, $providerId)) {
+			// FIXME Use dedicated exception and handle it
+			throw new UnsupportedFilter($name, $providerId);
+		}
+
+		return FilterFactory::get($filterDefinition->type(), $value);
+	}
+
+	private function filterSupportedByProvider(FilterDefinition $filterDefinition, string $providerId): bool {
+		// Non exclusive filters can be ommited by apps
+		if (!$filterDefinition->exclusive()) {
+			return true;
+		}
+
+		$provider = $this->providers[$providerId]['provider'];
+		$supportedFilters = $provider instanceof IFilteringProvider
+			? $provider->getSupportedFilters()
+			: ['term'];
+
+		return in_array($filterDefinition->name(), $supportedFilters, true);
+	}
+
 	/**
 	 * Query an individual search provider for results
 	 *
@@ -147,15 +317,18 @@ class SearchComposer {
 	 * @return SearchResult
 	 * @throws InvalidArgumentException when the $providerId does not correspond to a registered provider
 	 */
-	public function search(IUser $user,
-						   string $providerId,
-						   ISearchQuery $query): SearchResult {
-		$this->loadLazyProviders();
+	public function search(
+		IUser $user,
+		string $providerId,
+		ISearchQuery $query,
+	): SearchResult {
+		$this->loadLazyProviders($providerId);
 
-		$provider = $this->providers[$providerId] ?? null;
+		$provider = $this->providers[$providerId]['provider'] ?? null;
 		if ($provider === null) {
 			throw new InvalidArgumentException("Provider $providerId is unknown");
 		}
+
 		return $provider->search($user, $query);
 	}
 }
diff --git a/lib/private/Search/SearchQuery.php b/lib/private/Search/SearchQuery.php
index c89446d5970..aae2044bcd6 100644
--- a/lib/private/Search/SearchQuery.php
+++ b/lib/private/Search/SearchQuery.php
@@ -27,89 +27,57 @@ declare(strict_types=1);
  */
 namespace OC\Search;
 
+use OCP\Search\IFilterCollection;
+use OCP\Search\IFilter;
 use OCP\Search\ISearchQuery;
 
 class SearchQuery implements ISearchQuery {
 	public const LIMIT_DEFAULT = 5;
 
-	/** @var string */
-	private $term;
-
-	/** @var int */
-	private $sortOrder;
-
-	/** @var int */
-	private $limit;
-
-	/** @var int|string|null */
-	private $cursor;
-
-	/** @var string */
-	private $route;
-
-	/** @var array */
-	private $routeParameters;
-
 	/**
-	 * @param string $term
-	 * @param int $sortOrder
-	 * @param int $limit
-	 * @param int|string|null $cursor
-	 * @param string $route
-	 * @param array $routeParameters
+	 * @param string[] $params Request query
+	 * @param string[] $routeParameters
 	 */
-	public function __construct(string $term,
-								int $sortOrder = ISearchQuery::SORT_DATE_DESC,
-								int $limit = self::LIMIT_DEFAULT,
-								$cursor = null,
-								string $route = '',
-								array $routeParameters = []) {
-		$this->term = $term;
-		$this->sortOrder = $sortOrder;
-		$this->limit = $limit;
-		$this->cursor = $cursor;
-		$this->route = $route;
-		$this->routeParameters = $routeParameters;
+	public function __construct(
+		private IFilterCollection $filters,
+		private int $sortOrder = ISearchQuery::SORT_DATE_DESC,
+		private int $limit = self::LIMIT_DEFAULT,
+		private int|string|null $cursor = null,
+		private string $route = '',
+		private	array $routeParameters = [],
+	) {
 	}
 
-	/**
-	 * @inheritDoc
-	 */
 	public function getTerm(): string {
-		return $this->term;
+		return $this->getFilter('term')?->get() ?? '';
+	}
+
+	public function getFilter(string $name): ?IFilter {
+		return $this->filters->has($name)
+			? $this->filters->get($name)
+			: null;
+	}
+
+	public function getFilters(): IFilterCollection {
+		return $this->filters;
 	}
 
-	/**
-	 * @inheritDoc
-	 */
 	public function getSortOrder(): int {
 		return $this->sortOrder;
 	}
 
-	/**
-	 * @inheritDoc
-	 */
 	public function getLimit(): int {
 		return $this->limit;
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getCursor() {
+	public function getCursor(): int|string|null {
 		return $this->cursor;
 	}
 
-	/**
-	 * @inheritDoc
-	 */
 	public function getRoute(): string {
 		return $this->route;
 	}
 
-	/**
-	 * @inheritDoc
-	 */
 	public function getRouteParameters(): array {
 		return $this->routeParameters;
 	}
diff --git a/lib/private/Search/UnsupportedFilter.php b/lib/private/Search/UnsupportedFilter.php
new file mode 100644
index 00000000000..84b6163d2fa
--- /dev/null
+++ b/lib/private/Search/UnsupportedFilter.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2023 Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @author Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OC\Search;
+
+use Exception;
+
+final class UnsupportedFilter extends Exception {
+	public function __construct(string $filerName, $providerId) {
+		parent::__construct('Provider '.$providerId.' doesn’t support filter '.$filerName.'.');
+	}
+}