import * as express from 'express'
-import { isNSFWHidden } from '../../helpers/express-utils'
+import { buildNSFWFilter } from '../../helpers/express-utils'
import { getFormattedObjects } from '../../helpers/utils'
import { VideoModel } from '../../models/video/video'
import {
asyncMiddleware,
+ commonVideosFiltersValidator,
optionalAuthenticate,
paginationValidator,
searchValidator,
setDefaultSearchSort,
videosSearchSortValidator
} from '../../middlewares'
+import { VideosSearchQuery } from '../../../shared/models/search'
const searchRouter = express.Router()
videosSearchSortValidator,
setDefaultSearchSort,
optionalAuthenticate,
+ commonVideosFiltersValidator,
searchValidator,
asyncMiddleware(searchVideos)
)
// ---------------------------------------------------------------------------
async function searchVideos (req: express.Request, res: express.Response) {
- const resultList = await VideoModel.searchAndPopulateAccountAndServer(
- req.query.search as string,
- req.query.start as number,
- req.query.count as number,
- req.query.sort as string,
- isNSFWHidden(res)
- )
+ const query: VideosSearchQuery = req.query
+
+ const options = Object.assign(query, { nsfw: buildNSFWFilter(res, query.nsfw) })
+ const resultList = await VideoModel.searchAndPopulateAccountAndServer(options)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}