From fbd67e7f386504e50f2504cb6386700a58906f16 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 28 Jul 2021 16:40:21 +0200 Subject: Add ability to search by uuids/actor names --- server/controllers/api/search/search-video-channels.ts | 7 ++++--- server/controllers/api/search/search-video-playlists.ts | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'server/controllers/api/search') diff --git a/server/controllers/api/search/search-video-channels.ts b/server/controllers/api/search/search-video-channels.ts index be0b6b9a2..9fc2d53a5 100644 --- a/server/controllers/api/search/search-video-channels.ts +++ b/server/controllers/api/search/search-video-channels.ts @@ -46,7 +46,7 @@ export { searchChannelsRouter } function searchVideoChannels (req: express.Request, res: express.Response) { const query: VideoChannelsSearchQuery = req.query - const search = query.search + let search = query.search || '' const parts = search.split('@') @@ -57,7 +57,7 @@ function searchVideoChannels (req: express.Request, res: express.Response) { if (isURISearch(search) || isWebfingerSearch) return searchVideoChannelURI(search, isWebfingerSearch, res) // @username -> username to search in DB - if (query.search.startsWith('@')) query.search = query.search.replace(/^@/, '') + if (search.startsWith('@')) search = search.replace(/^@/, '') if (isSearchIndexSearch(query)) { return searchVideoChannelsIndex(query, res) @@ -99,7 +99,8 @@ async function searchVideoChannelsDB (query: VideoChannelsSearchQuery, res: expr start: query.start, count: query.count, sort: query.sort, - host: query.host + host: query.host, + names: query.names }, 'filter:api.search.video-channels.local.list.params') const resultList = await Hooks.wrapPromiseFun( diff --git a/server/controllers/api/search/search-video-playlists.ts b/server/controllers/api/search/search-video-playlists.ts index 60d1a44f7..bd6a2a564 100644 --- a/server/controllers/api/search/search-video-playlists.ts +++ b/server/controllers/api/search/search-video-playlists.ts @@ -89,7 +89,8 @@ async function searchVideoPlaylistsDB (query: VideoPlaylistsSearchQuery, res: ex start: query.start, count: query.count, sort: query.sort, - host: query.host + host: query.host, + uuids: query.uuids }, 'filter:api.search.video-playlists.local.list.params') const resultList = await Hooks.wrapPromiseFun( -- cgit v1.2.3