sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56344 from nextcloud/backport/55434/stable31 

[stable31] fix(unified-search): Remove hard-coded search result limit
pull/56432/head
Stephan Orbaugh 2025-11-13 17:08:02 +07:00 committed by GitHub
parent aec7253ddd 5d01642813
commit 789045a410
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/AppInfo/ConfigLexicon.php
Unescape Escape View File

@ -20,6 +20,7 @@ use NCU\Config\ValueType;
*/
class ConfigLexicon implements IConfigLexicon {
public const UNIFIED_SEARCH_MIN_SEARCH_LENGTH = 'unified_search_min_search_length';
public const UNIFIED_SEARCH_MAX_RESULTS_PER_REQUEST = 'unified_search_max_results_per_request';
public function getStrictness(): ConfigLexiconStrictness {
return ConfigLexiconStrictness::IGNORE;
@ -28,6 +29,7 @@ class ConfigLexicon implements IConfigLexicon {
public function getAppConfigs(): array {
return [
new ConfigLexiconEntry(self::UNIFIED_SEARCH_MIN_SEARCH_LENGTH, ValueType::INT, 1, 'Minimum search length to trigger the request', lazy: false),
new ConfigLexiconEntry(self::UNIFIED_SEARCH_MAX_RESULTS_PER_REQUEST, ValueType::INT, 25, 'Maximum number of results returned per request', lazy: false),
];
}

9
core/Controller/UnifiedSearchController.php
Unescape Escape View File

@ -9,6 +9,8 @@ declare(strict_types=1);
namespace OC\Core\Controller;
use InvalidArgumentException;
use OC\Core\AppInfo\ConfigLexicon;
use OC\Core\Application;
use OC\Core\ResponseDefinitions;
use OC\Search\SearchComposer;
use OC\Search\SearchQuery;
@ -19,6 +21,7 @@ use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCSController;
use OCP\IAppConfig;
use OCP\IL10N;
use OCP\IRequest;
use OCP\IURLGenerator;
@ -39,6 +42,7 @@ class UnifiedSearchController extends OCSController {
private IRouter $router,
private IURLGenerator $urlGenerator,
private IL10N $l10n,
private IAppConfig $appConfig,
) {
parent::__construct('core', $request);
}
@ -72,7 +76,7 @@ class UnifiedSearchController extends OCSController {
* @param string $providerId ID of the provider
* @param string $term Term to search
* @param int|null $sortOrder Order of entries
* @param int|null $limit Maximum amount of entries, limited to 25
* @param int|null $limit Maximum amount of entries (capped by configurable unified-search.max-results-per-request, default: 25)
* @param int|string|null $cursor Offset for searching
* @param string $from The current user URL
*
@ -96,7 +100,8 @@ class UnifiedSearchController extends OCSController {
[$route, $routeParameters] = $this->getRouteInformation($from);
$limit ??= SearchQuery::LIMIT_DEFAULT;
$limit = max(1, min($limit, 25));
$maxLimit = $this->appConfig->getValueInt(Application::APP_ID, ConfigLexicon::UNIFIED_SEARCH_MAX_RESULTS_PER_REQUEST);
$limit = max(1, min($limit, $maxLimit));
try {
$filters = $this->composer->buildFilterList($providerId, $this->request->getParams());

2
core/openapi-full.json
Unescape Escape View File

@ -7448,7 +7448,7 @@
{
"name": "limit",
"in": "query",
"description": "Maximum amount of entries, limited to 25",
"description": "Maximum amount of entries (capped by configurable unified-search.max-results-per-request, default: 25)",
"schema": {
"type": "integer",
"format": "int64",

2
core/openapi.json
Unescape Escape View File

@ -7448,7 +7448,7 @@
{
"name": "limit",
"in": "query",
"description": "Maximum amount of entries, limited to 25",
"description": "Maximum amount of entries (capped by configurable unified-search.max-results-per-request, default: 25)",
"schema": {
"type": "integer",
"format": "int64",