From 3521ab8fc01da85fa804439ca6e297e6fb364c58 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 10 Jun 2020 10:58:44 +0200 Subject: Add search index tests --- server/controllers/api/config.ts | 2 +- server/controllers/api/search.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'server/controllers') diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index 1d48b4b26..b80ea4902 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts @@ -463,7 +463,7 @@ function customConfig (): CustomConfig { disableLocalSearch: CONFIG.SEARCH.SEARCH_INDEX.DISABLE_LOCAL_SEARCH, isDefaultSearch: CONFIG.SEARCH.SEARCH_INDEX.IS_DEFAULT_SEARCH } - }, + } } } diff --git a/server/controllers/api/search.ts b/server/controllers/api/search.ts index e08e1d79f..1dea77d29 100644 --- a/server/controllers/api/search.ts +++ b/server/controllers/api/search.ts @@ -76,7 +76,7 @@ function searchVideoChannels (req: express.Request, res: express.Response) { // @username -> username to search in DB if (query.search.startsWith('@')) query.search = query.search.replace(/^@/, '') - if (isSearchIndexEnabled(query)) { + if (isSearchIndexSearch(query)) { return searchVideoChannelsIndex(query, res) } @@ -157,7 +157,7 @@ function searchVideos (req: express.Request, res: express.Response) { return searchVideoURI(search, res) } - if (isSearchIndexEnabled(query)) { + if (isSearchIndexSearch(query)) { return searchVideosIndex(query, res) } @@ -226,7 +226,7 @@ async function searchVideoURI (url: string, res: express.Response) { }) } -function isSearchIndexEnabled (query: SearchTargetQuery) { +function isSearchIndexSearch (query: SearchTargetQuery) { if (query.searchTarget === 'search-index') return true const searchIndexConfig = CONFIG.SEARCH.SEARCH_INDEX -- cgit v1.2.3