Use raw sql for comments

[github/Chocobozzz/PeerTube.git] / server / controllers / api / search / search-video-playlists.ts

diff --git a/server/controllers/api/search/search-video-playlists.ts b/server/controllers/api/search/search-video-playlists.ts
index f55b1fba3764099fc3d15796a7f8d875115d373d..e76d65fdeb81579559f08a619031821a7001079b 100644 (file)
--- a/server/controllers/api/search/search-video-playlists.ts
+++ b/server/controllers/api/search/search-video-playlists.ts
@@ -1,8 +1,9 @@
-import * as express from 'express'
+import express from 'express'
 import { sanitizeUrl } from '@server/helpers/core-utils'
 import { isUserAbleToSearchRemoteURI } from '@server/helpers/express-utils'
 import { logger } from '@server/helpers/logger'
-import { doJSONRequest } from '@server/helpers/requests'
+import { pickSearchPlaylistQuery } from '@server/helpers/query'
+import { doJSONRequest, findLatestRedirection } from '@server/helpers/requests'
 import { getFormattedObjects } from '@server/helpers/utils'
 import { CONFIG } from '@server/initializers/config'
 import { WEBSERVER } from '@server/initializers/constants'
@@ -12,7 +13,7 @@ import { buildMutedForSearchIndex, isSearchIndexSearch, isURISearch } from '@ser
 import { getServerActor } from '@server/models/application/application'
 import { VideoPlaylistModel } from '@server/models/video/video-playlist'
 import { MVideoPlaylistFullSummary } from '@server/types/models'
-import { HttpStatusCode, ResultList, VideoPlaylist, VideoPlaylistsSearchQuery } from '@shared/models'
+import { HttpStatusCode, ResultList, VideoPlaylist, VideoPlaylistsSearchQueryAfterSanitize } from '@shared/models'
 import {
   asyncMiddleware,
   openapiOperationDoc,
@@ -23,6 +24,7 @@ import {
   videoPlaylistsListSearchValidator,
   videoPlaylistsSearchSortValidator
 } from '../../../middlewares'
+import { searchLocalUrl } from './shared'
 
 const searchPlaylistsRouter = express.Router()
 
@@ -44,7 +46,7 @@ export { searchPlaylistsRouter }
 // ---------------------------------------------------------------------------
 
 function searchVideoPlaylists (req: express.Request, res: express.Response) {
-  const query: VideoPlaylistsSearchQuery = req.query
+  const query = pickSearchPlaylistQuery(req.query)
   const search = query.search
 
   if (isURISearch(search)) return searchVideoPlaylistsURI(search, res)
@@ -56,7 +58,7 @@ function searchVideoPlaylists (req: express.Request, res: express.Response) {
   return searchVideoPlaylistsDB(query, res)
 }
 
-async function searchVideoPlaylistsIndex (query: VideoPlaylistsSearchQuery, res: express.Response) {
+async function searchVideoPlaylistsIndex (query: VideoPlaylistsSearchQueryAfterSanitize, res: express.Response) {
   const result = await buildMutedForSearchIndex(res)
 
   const body = await Hooks.wrapObject(Object.assign(query, result), 'filter:api.search.video-playlists.index.list.params')
@@ -80,15 +82,13 @@ async function searchVideoPlaylistsIndex (query: VideoPlaylistsSearchQuery, res:
   }
 }
 
-async function searchVideoPlaylistsDB (query: VideoPlaylistsSearchQuery, res: express.Response) {
+async function searchVideoPlaylistsDB (query: VideoPlaylistsSearchQueryAfterSanitize, res: express.Response) {
   const serverActor = await getServerActor()
 
   const apiOptions = await Hooks.wrapObject({
-    followerActorId: serverActor.id,
-    search: query.search,
-    start: query.start,
-    count: query.count,
-    sort: query.sort
+    ...query,
+
+    followerActorId: serverActor.id
   }, 'filter:api.search.video-playlists.local.list.params')
 
   const resultList = await Hooks.wrapPromiseFun(
@@ -105,12 +105,14 @@ async function searchVideoPlaylistsURI (search: string, res: express.Response) {
 
   if (isUserAbleToSearchRemoteURI(res)) {
     try {
-      videoPlaylist = await getOrCreateAPVideoPlaylist(search)
+      const url = await findLatestRedirection(search, { activityPub: true })
+
+      videoPlaylist = await getOrCreateAPVideoPlaylist(url)
     } catch (err) {
       logger.info('Cannot search remote video playlist %s.', search, { err })
     }
   } else {
-    videoPlaylist = await VideoPlaylistModel.loadByUrlWithAccountAndChannelSummary(sanitizeLocalUrl(search))
+    videoPlaylist = await searchLocalUrl(sanitizeLocalUrl(search), url => VideoPlaylistModel.loadByUrlWithAccountAndChannelSummary(url))
   }
 
   return res.json({