From fbad149ff2da2bb0b2fd33b2c8bc7e398f5a12b5 Mon Sep 17 00:00:00 2001 From: Florent Date: Wed, 23 Nov 2022 15:50:34 +0100 Subject: Fix DISABLE_LOCAL_SEARCH blocking request to local search API (#5411) --- config/default.yaml | 4 ++-- server/helpers/custom-validators/search.ts | 2 +- server/lib/search.ts | 1 - server/tests/api/check-params/search.ts | 5 ----- server/tests/api/search/search-index.ts | 22 ---------------------- 5 files changed, 3 insertions(+), 31 deletions(-) diff --git a/config/default.yaml b/config/default.yaml index 19e2fcf3a..1b7c3314d 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -730,9 +730,9 @@ search: # You should deploy your own with https://framagit.org/framasoft/peertube/search-index, # and can use https://search.joinpeertube.org/ for tests, but keep in mind the latter is an unmoderated search index url: '' - # You can disable local search, so users only use the search index + # You can disable local search in the client, so users only use the search index disable_local_search: false - # If you did not disable local search, you can decide to use the search index by default + # If you did not disable local search in the client, you can decide to use the search index by default is_default_search: false # PeerTube client/interface configuration diff --git a/server/helpers/custom-validators/search.ts b/server/helpers/custom-validators/search.ts index a8f258838..6dba5d14e 100644 --- a/server/helpers/custom-validators/search.ts +++ b/server/helpers/custom-validators/search.ts @@ -20,7 +20,7 @@ function isSearchTargetValid (value: SearchTargetType) { const searchIndexConfig = CONFIG.SEARCH.SEARCH_INDEX - if (value === 'local' && (!searchIndexConfig.ENABLED || !searchIndexConfig.DISABLE_LOCAL_SEARCH)) return true + if (value === 'local') return true if (value === 'search-index' && searchIndexConfig.ENABLED) return true diff --git a/server/lib/search.ts b/server/lib/search.ts index 2f4c5eed9..b3363fbec 100644 --- a/server/lib/search.ts +++ b/server/lib/search.ts @@ -12,7 +12,6 @@ function isSearchIndexSearch (query: SearchTargetQuery) { if (searchIndexConfig.ENABLED !== true) return false - if (searchIndexConfig.DISABLE_LOCAL_SEARCH) return true if (searchIndexConfig.IS_DEFAULT_SEARCH && !query.searchTarget) return true return false diff --git a/server/tests/api/check-params/search.ts b/server/tests/api/check-params/search.ts index 91e9122a7..72c25ba33 100644 --- a/server/tests/api/check-params/search.ts +++ b/server/tests/api/check-params/search.ts @@ -251,11 +251,6 @@ describe('Test videos API validator', function () { await updateSearchIndex(server, true, true) - { - const customQuery = { ...query, searchTarget: 'local' } - await makeGetRequest({ url: server.url, path, query: customQuery, expectedStatus: HttpStatusCode.BAD_REQUEST_400 }) - } - { const customQuery = { ...query, searchTarget: 'search-index' } await makeGetRequest({ url: server.url, path, query: customQuery, expectedStatus: HttpStatusCode.OK_200 }) diff --git a/server/tests/api/search/search-index.ts b/server/tests/api/search/search-index.ts index c61ac441d..eae4391ec 100644 --- a/server/tests/api/search/search-index.ts +++ b/server/tests/api/search/search-index.ts @@ -81,28 +81,6 @@ describe('Test index search', function () { const body = await command.searchChannels({ search: 'root' }) expect(body.total).to.be.greaterThan(2) }) - - it('Should make an index videos search if local search is disabled', async function () { - await server.config.updateCustomSubConfig({ - newConfig: { - search: { - searchIndex: { - enabled: true, - isDefaultSearch: false, - disableLocalSearch: true - } - } - } - }) - - const body = await command.searchVideos({ search: 'local video' }) - expect(body.total).to.be.greaterThan(2) - }) - - it('Should make an index channels search if local search is disabled', async function () { - const body = await command.searchChannels({ search: 'root' }) - expect(body.total).to.be.greaterThan(2) - }) }) describe('Videos search', async function () { -- cgit v1.2.3