import * as express from 'express'
import { getFormattedObjects } from '../../helpers/utils'
import {
- asyncMiddleware,
+ asyncMiddleware, commonVideosFiltersValidator,
listVideoAccountChannelsValidator,
optionalAuthenticate,
paginationValidator,
import { accountsNameWithHostGetValidator, accountsSortValidator, videosSortValidator } from '../../middlewares/validators'
import { AccountModel } from '../../models/account/account'
import { VideoModel } from '../../models/video/video'
-import { isNSFWHidden } from '../../helpers/express-utils'
+import { buildNSFWFilter } from '../../helpers/express-utils'
import { VideoChannelModel } from '../../models/video/video-channel'
const accountsRouter = express.Router()
setDefaultSort,
setDefaultPagination,
optionalAuthenticate,
+ commonVideosFiltersValidator,
asyncMiddleware(listAccountVideos)
)
start: req.query.start,
count: req.query.count,
sort: req.query.sort,
- hideNSFW: isNSFWHidden(res),
+ categoryOneOf: req.query.categoryOneOf,
+ licenceOneOf: req.query.licenceOneOf,
+ languageOneOf: req.query.languageOneOf,
+ tagsOneOf: req.query.tagsOneOf,
+ tagsAllOf: req.query.tagsAllOf,
+ nsfw: buildNSFWFilter(res, req.query.nsfw),
withFiles: false,
accountId: account.id
})
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))
}
import {
asyncMiddleware,
asyncRetryTransactionMiddleware,
- authenticate,
+ authenticate, commonVideosFiltersValidator,
optionalAuthenticate,
paginationValidator,
setDefaultPagination,
import { sendUpdateActor } from '../../lib/activitypub/send'
import { VideoChannelCreate, VideoChannelUpdate } from '../../../shared'
import { createVideoChannel } from '../../lib/video-channel'
-import { createReqFiles, isNSFWHidden } from '../../helpers/express-utils'
+import { createReqFiles, buildNSFWFilter } from '../../helpers/express-utils'
import { setAsyncActorKeys } from '../../lib/activitypub'
import { AccountModel } from '../../models/account/account'
import { CONFIG, IMAGE_MIMETYPE_EXT, sequelizeTypescript } from '../../initializers'
setDefaultSort,
setDefaultPagination,
optionalAuthenticate,
+ commonVideosFiltersValidator,
asyncMiddleware(listVideoChannelVideos)
)
start: req.query.start,
count: req.query.count,
sort: req.query.sort,
- hideNSFW: isNSFWHidden(res),
+ categoryOneOf: req.query.categoryOneOf,
+ licenceOneOf: req.query.licenceOneOf,
+ languageOneOf: req.query.languageOneOf,
+ tagsOneOf: req.query.tagsOneOf,
+ tagsAllOf: req.query.tagsAllOf,
+ nsfw: buildNSFWFilter(res, req.query.nsfw),
withFiles: false,
videoChannelId: videoChannelInstance.id
})
asyncMiddleware,
asyncRetryTransactionMiddleware,
authenticate,
+ commonVideosFiltersValidator,
optionalAuthenticate,
paginationValidator,
setDefaultPagination,
import { videoCommentRouter } from './comment'
import { rateVideoRouter } from './rate'
import { VideoFilter } from '../../../../shared/models/videos/video-query.type'
-import { createReqFiles, isNSFWHidden } from '../../../helpers/express-utils'
+import { createReqFiles, buildNSFWFilter } from '../../../helpers/express-utils'
import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update'
import { videoCaptionsRouter } from './captions'
setDefaultSort,
setDefaultPagination,
optionalAuthenticate,
+ commonVideosFiltersValidator,
asyncMiddleware(listVideos)
)
videosRouter.put('/:id',
start: req.query.start,
count: req.query.count,
sort: req.query.sort,
- category: req.query.category,
- hideNSFW: isNSFWHidden(res),
+ categoryOneOf: req.query.categoryOneOf,
+ licenceOneOf: req.query.licenceOneOf,
+ languageOneOf: req.query.languageOneOf,
+ tagsOneOf: req.query.tagsOneOf,
+ tagsAllOf: req.query.tagsAllOf,
+ nsfw: buildNSFWFilter(res, req.query.nsfw),
filter: req.query.filter as VideoFilter,
withFiles: false
})
import { cacheRoute } from '../middlewares/cache'
import { VideoChannelModel } from '../models/video/video-channel'
import { VideoCommentModel } from '../models/video/video-comment'
+import { buildNSFWFilter } from '../helpers/express-utils'
const feedsRouter = express.Router()
const account: AccountModel = res.locals.account
const videoChannel: VideoChannelModel = res.locals.videoChannel
- const hideNSFW = CONFIG.INSTANCE.DEFAULT_NSFW_POLICY === 'do_not_list'
+ const nsfw = buildNSFWFilter(res, req.query.nsfw)
let name: string
let description: string
start,
count: FEEDS.COUNT,
sort: req.query.sort,
- hideNSFW,
+ nsfw,
filter: req.query.filter,
withFiles: true,
accountId: account ? account.id : null,
return value
}
+function toArray (value: string) {
+ if (value && isArray(value) === false) return [ value ]
+
+ return value
+}
+
function isFileValid (
files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[],
mimeTypeRegex: string,
toValueOrNull,
isBooleanValid,
toIntOrNull,
+ toArray,
isFileValid
}
--- /dev/null
+import * as validator from 'validator'
+import 'express-validator'
+
+import { isArray } from './misc'
+
+function isNumberArray (value: any) {
+ return isArray(value) && value.every(v => validator.isInt('' + v))
+}
+
+function isStringArray (value: any) {
+ return isArray(value) && value.every(v => typeof v === 'string')
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+ isNumberArray,
+ isStringArray
+}
import { User } from '../../shared/models/users'
import { generateRandomString } from './utils'
-function isNSFWHidden (res: express.Response) {
+function buildNSFWFilter (res: express.Response, paramNSFW?: boolean) {
+ if (paramNSFW === true || paramNSFW === false) return paramNSFW
+
if (res.locals.oauth) {
const user: User = res.locals.oauth.token.User
- if (user) return user.nsfwPolicy === 'do_not_list'
+ // User does not want NSFW videos
+ if (user && user.nsfwPolicy === 'do_not_list') return false
}
- return CONFIG.INSTANCE.DEFAULT_NSFW_POLICY === 'do_not_list'
+ if (CONFIG.INSTANCE.DEFAULT_NSFW_POLICY === 'do_not_list') return false
+
+ // Display all
+ return null
}
function getHostWithPort (host: string) {
// ---------------------------------------------------------------------------
export {
- isNSFWHidden,
+ buildNSFWFilter,
getHostWithPort,
badRequest,
createReqFiles
FOLLOWERS: [ 'createdAt' ],
FOLLOWING: [ 'createdAt' ],
- VIDEOS_SEARCH: [ 'bestmatch', 'name', 'duration', 'createdAt', 'publishedAt', 'views', 'likes' ]
+ VIDEOS_SEARCH: [ 'match', 'name', 'duration', 'createdAt', 'publishedAt', 'views', 'likes' ]
}
const OAUTH_LIFETIME = {
}
function setDefaultSearchSort (req: express.Request, res: express.Response, next: express.NextFunction) {
- if (!req.query.sort) req.query.sort = '-bestmatch'
+ if (!req.query.sort) req.query.sort = '-match'
return next()
}
import { areValidationErrors } from './utils'
import { logger } from '../../helpers/logger'
import { query } from 'express-validator/check'
+import { isNumberArray, isStringArray } from '../../helpers/custom-validators/search'
+import { isBooleanValid, isDateValid, toArray } from '../../helpers/custom-validators/misc'
const searchValidator = [
query('search').not().isEmpty().withMessage('Should have a valid search'),
+ query('startDate').optional().custom(isDateValid).withMessage('Should have a valid start date'),
+ query('endDate').optional().custom(isDateValid).withMessage('Should have a valid end date'),
+
+ query('durationMin').optional().isInt().withMessage('Should have a valid min duration'),
+ query('durationMax').optional().isInt().withMessage('Should have a valid max duration'),
+
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking search query', { parameters: req.query })
+
+ if (areValidationErrors(req, res)) return
+
+ return next()
+ }
+]
+
+const commonVideosFiltersValidator = [
+ query('categoryOneOf')
+ .optional()
+ .customSanitizer(toArray)
+ .custom(isNumberArray).withMessage('Should have a valid one of category array'),
+ query('licenceOneOf')
+ .optional()
+ .customSanitizer(toArray)
+ .custom(isNumberArray).withMessage('Should have a valid one of licence array'),
+ query('languageOneOf')
+ .optional()
+ .customSanitizer(toArray)
+ .custom(isStringArray).withMessage('Should have a valid one of language array'),
+ query('tagsOneOf')
+ .optional()
+ .customSanitizer(toArray)
+ .custom(isStringArray).withMessage('Should have a valid one of tags array'),
+ query('tagsAllOf')
+ .optional()
+ .customSanitizer(toArray)
+ .custom(isStringArray).withMessage('Should have a valid all of tags array'),
+ query('nsfw')
+ .optional()
+ .toBoolean()
+ .custom(isBooleanValid).withMessage('Should have a valid NSFW attribute'),
+
(req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking search parameters', { parameters: req.params })
+ logger.debug('Checking commons video filters query', { parameters: req.query })
if (areValidationErrors(req, res)) return
// ---------------------------------------------------------------------------
export {
+ commonVideosFiltersValidator,
searchValidator
}
}
// Alias
- if (field.toLowerCase() === 'bestmatch') field = Sequelize.col('similarity')
+ if (field.toLowerCase() === 'match') field = Sequelize.col('similarity')
return [ [ field, direction ], lastSort ]
}
import { VideoTagModel } from './video-tag'
import { ScheduleVideoUpdateModel } from './schedule-video-update'
import { VideoCaptionModel } from './video-caption'
+import { VideosSearchQuery } from '../../../shared/models/search'
// FIXME: Define indexes here because there is an issue with TS and Sequelize.literal when called directly in the annotation
const indexes: Sequelize.DefineIndexesOptions[] = [
WITH_SCHEDULED_UPDATE = 'WITH_SCHEDULED_UPDATE'
}
+type AvailableForListOptions = {
+ actorId: number,
+ filter?: VideoFilter,
+ categoryOneOf?: number[],
+ nsfw?: boolean,
+ licenceOneOf?: number[],
+ languageOneOf?: string[],
+ tagsOneOf?: string[],
+ tagsAllOf?: string[],
+ withFiles?: boolean,
+ accountId?: number,
+ videoChannelId?: number
+}
+
@Scopes({
- [ScopeNames.AVAILABLE_FOR_LIST]: (options: {
- actorId: number,
- hideNSFW: boolean,
- filter?: VideoFilter,
- category?: number,
- withFiles?: boolean,
- accountId?: number,
- videoChannelId?: number
- }) => {
+ [ScopeNames.AVAILABLE_FOR_LIST]: (options: AvailableForListOptions) => {
const accountInclude = {
attributes: [ 'id', 'name' ],
model: AccountModel.unscoped(),
})
}
- // Hide nsfw videos?
- if (options.hideNSFW === true) {
- query.where['nsfw'] = false
+ // FIXME: issues with sequelize count when making a join on n:m relation, so we just make a IN()
+ if (options.tagsAllOf || options.tagsOneOf) {
+ const createTagsIn = (tags: string[]) => {
+ return tags.map(t => VideoModel.sequelize.escape(t))
+ .join(', ')
+ }
+
+ if (options.tagsOneOf) {
+ query.where['id'][Sequelize.Op.in] = Sequelize.literal(
+ '(' +
+ 'SELECT "videoId" FROM "videoTag" ' +
+ 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
+ 'WHERE "tag"."name" IN (' + createTagsIn(options.tagsOneOf) + ')' +
+ ')'
+ )
+ }
+
+ if (options.tagsAllOf) {
+ query.where['id'][Sequelize.Op.in] = Sequelize.literal(
+ '(' +
+ 'SELECT "videoId" FROM "videoTag" ' +
+ 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
+ 'WHERE "tag"."name" IN (' + createTagsIn(options.tagsAllOf) + ')' +
+ 'GROUP BY "videoTag"."videoId" HAVING COUNT(*) = ' + options.tagsAllOf.length +
+ ')'
+ )
+ }
+ }
+
+ if (options.nsfw === true || options.nsfw === false) {
+ query.where['nsfw'] = options.nsfw
+ }
+
+ if (options.categoryOneOf) {
+ query.where['category'] = {
+ [Sequelize.Op.or]: options.categoryOneOf
+ }
+ }
+
+ if (options.licenceOneOf) {
+ query.where['licence'] = {
+ [Sequelize.Op.or]: options.licenceOneOf
+ }
}
- if (options.category) {
- query.where['category'] = options.category
+ if (options.languageOneOf) {
+ query.where['language'] = {
+ [Sequelize.Op.or]: options.languageOneOf
+ }
}
if (options.accountId) {
start: number,
count: number,
sort: string,
- hideNSFW: boolean,
+ nsfw: boolean,
withFiles: boolean,
- category?: number,
+ categoryOneOf?: number[],
+ licenceOneOf?: number[],
+ languageOneOf?: string[],
+ tagsOneOf?: string[],
+ tagsAllOf?: string[],
filter?: VideoFilter,
accountId?: number,
videoChannelId?: number
method: [
ScopeNames.AVAILABLE_FOR_LIST, {
actorId: serverActor.id,
- hideNSFW: options.hideNSFW,
- category: options.category,
+ nsfw: options.nsfw,
+ categoryOneOf: options.categoryOneOf,
+ licenceOneOf: options.licenceOneOf,
+ languageOneOf: options.languageOneOf,
+ tagsOneOf: options.tagsOneOf,
+ tagsAllOf: options.tagsAllOf,
filter: options.filter,
withFiles: options.withFiles,
accountId: options.accountId,
videoChannelId: options.videoChannelId
- }
+ } as AvailableForListOptions
]
}
})
}
- static async searchAndPopulateAccountAndServer (value: string, start: number, count: number, sort: string, hideNSFW: boolean) {
+ static async searchAndPopulateAccountAndServer (options: VideosSearchQuery) {
+ const whereAnd = [ ]
+
+ if (options.startDate || options.endDate) {
+ const publishedAtRange = { }
+
+ if (options.startDate) publishedAtRange[Sequelize.Op.gte] = options.startDate
+ if (options.endDate) publishedAtRange[Sequelize.Op.lte] = options.endDate
+
+ whereAnd.push({ publishedAt: publishedAtRange })
+ }
+
+ if (options.durationMin || options.durationMax) {
+ const durationRange = { }
+
+ if (options.durationMin) durationRange[Sequelize.Op.gte] = options.durationMin
+ if (options.durationMax) durationRange[Sequelize.Op.lte] = options.durationMax
+
+ whereAnd.push({ duration: durationRange })
+ }
+
+ whereAnd.push(createSearchTrigramQuery('VideoModel.name', options.search))
+
const query: IFindOptions<VideoModel> = {
attributes: {
- include: [ createSimilarityAttribute('VideoModel.name', value) ]
+ include: [ createSimilarityAttribute('VideoModel.name', options.search) ]
},
- offset: start,
- limit: count,
- order: getSort(sort),
- where: createSearchTrigramQuery('VideoModel.name', value)
+ offset: options.start,
+ limit: options.count,
+ order: getSort(options.sort),
+ where: {
+ [ Sequelize.Op.and ]: whereAnd
+ }
}
const serverActor = await getServerActor()
method: [
ScopeNames.AVAILABLE_FOR_LIST, {
actorId: serverActor.id,
- hideNSFW
- }
+ nsfw: options.nsfw,
+ categoryOneOf: options.categoryOneOf,
+ licenceOneOf: options.licenceOneOf,
+ languageOneOf: options.languageOneOf,
+ tagsOneOf: options.tagsOneOf,
+ tagsAllOf: options.tagsAllOf
+ } as AvailableForListOptions
]
}
import './video-channels'
import './video-comments'
import './videos'
+import './search'
--- /dev/null
+/* tslint:disable:no-unused-expression */
+
+import 'mocha'
+
+import { flushTests, immutableAssign, killallServers, makeGetRequest, runServer, ServerInfo } from '../../utils'
+import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params'
+
+describe('Test videos API validator', function () {
+ const path = '/api/v1/search/videos/'
+ let server: ServerInfo
+
+ // ---------------------------------------------------------------
+
+ before(async function () {
+ this.timeout(30000)
+
+ await flushTests()
+
+ server = await runServer(1)
+ })
+
+ describe('When searching videos', function () {
+ const query = {
+ search: 'coucou'
+ }
+
+ it('Should fail with a bad start pagination', async function () {
+ await checkBadStartPagination(server.url, path, null, query)
+ })
+
+ it('Should fail with a bad count pagination', async function () {
+ await checkBadCountPagination(server.url, path, null, query)
+ })
+
+ it('Should fail with an incorrect sort', async function () {
+ await checkBadSortPagination(server.url, path, null, query)
+ })
+
+ it('Should success with the correct parameters', async function () {
+ await makeGetRequest({ url: server.url, path, query, statusCodeExpected: 200 })
+ })
+
+ it('Should fail with an invalid category', async function () {
+ const customQuery1 = immutableAssign(query, { categoryOneOf: [ 'aa', 'b' ] })
+ await makeGetRequest({ url: server.url, path, query: customQuery1, statusCodeExpected: 400 })
+
+ const customQuery2 = immutableAssign(query, { categoryOneOf: 'a' })
+ await makeGetRequest({ url: server.url, path, query: customQuery2, statusCodeExpected: 400 })
+ })
+
+ it('Should succeed with a valid category', async function () {
+ const customQuery1 = immutableAssign(query, { categoryOneOf: [ 1, 7 ] })
+ await makeGetRequest({ url: server.url, path, query: customQuery1, statusCodeExpected: 200 })
+
+ const customQuery2 = immutableAssign(query, { categoryOneOf: 1 })
+ await makeGetRequest({ url: server.url, path, query: customQuery2, statusCodeExpected: 200 })
+ })
+
+ it('Should fail with an invalid licence', async function () {
+ const customQuery1 = immutableAssign(query, { licenceOneOf: [ 'aa', 'b' ] })
+ await makeGetRequest({ url: server.url, path, query: customQuery1, statusCodeExpected: 400 })
+
+ const customQuery2 = immutableAssign(query, { licenceOneOf: 'a' })
+ await makeGetRequest({ url: server.url, path, query: customQuery2, statusCodeExpected: 400 })
+ })
+
+ it('Should succeed with a valid licence', async function () {
+ const customQuery1 = immutableAssign(query, { licenceOneOf: [ 1, 2 ] })
+ await makeGetRequest({ url: server.url, path, query: customQuery1, statusCodeExpected: 200 })
+
+ const customQuery2 = immutableAssign(query, { licenceOneOf: 1 })
+ await makeGetRequest({ url: server.url, path, query: customQuery2, statusCodeExpected: 200 })
+ })
+
+ it('Should succeed with a valid language', async function () {
+ const customQuery1 = immutableAssign(query, { languageOneOf: [ 'fr', 'en' ] })
+ await makeGetRequest({ url: server.url, path, query: customQuery1, statusCodeExpected: 200 })
+
+ const customQuery2 = immutableAssign(query, { languageOneOf: 'fr' })
+ await makeGetRequest({ url: server.url, path, query: customQuery2, statusCodeExpected: 200 })
+ })
+
+ it('Should succeed with valid tags', async function () {
+ const customQuery1 = immutableAssign(query, { tagsOneOf: [ 'tag1', 'tag2' ] })
+ await makeGetRequest({ url: server.url, path, query: customQuery1, statusCodeExpected: 200 })
+
+ const customQuery2 = immutableAssign(query, { tagsOneOf: 'tag1' })
+ await makeGetRequest({ url: server.url, path, query: customQuery2, statusCodeExpected: 200 })
+
+ const customQuery3 = immutableAssign(query, { tagsAllOf: [ 'tag1', 'tag2' ] })
+ await makeGetRequest({ url: server.url, path, query: customQuery3, statusCodeExpected: 200 })
+
+ const customQuery4 = immutableAssign(query, { tagsAllOf: 'tag1' })
+ await makeGetRequest({ url: server.url, path, query: customQuery4, statusCodeExpected: 200 })
+ })
+
+ it('Should fail with invalid durations', async function () {
+ const customQuery1 = immutableAssign(query, { durationMin: 'hello' })
+ await makeGetRequest({ url: server.url, path, query: customQuery1, statusCodeExpected: 400 })
+
+ const customQuery2 = immutableAssign(query, { durationMax: 'hello' })
+ await makeGetRequest({ url: server.url, path, query: customQuery2, statusCodeExpected: 400 })
+ })
+
+ it('Should fail with invalid dates', async function () {
+ const customQuery1 = immutableAssign(query, { startDate: 'hello' })
+ await makeGetRequest({ url: server.url, path, query: customQuery1, statusCodeExpected: 400 })
+
+ const customQuery2 = immutableAssign(query, { endDate: 'hello' })
+ await makeGetRequest({ url: server.url, path, query: customQuery2, statusCodeExpected: 400 })
+ })
+ })
+
+ after(async function () {
+ killallServers([ server ])
+
+ // Keep the logs if the test failed
+ if (this['ok']) {
+ await flushTests()
+ }
+ })
+})
import './server/email'
import './server/config'
import './server/reverse-proxy'
+import './search/search-videos'
--- /dev/null
+/* tslint:disable:no-unused-expression */
+
+import * as chai from 'chai'
+import 'mocha'
+import {
+ advancedVideosSearch,
+ flushTests,
+ killallServers,
+ runServer,
+ searchVideo,
+ ServerInfo,
+ setAccessTokensToServers,
+ uploadVideo,
+ wait,
+ immutableAssign
+} from '../../utils'
+
+const expect = chai.expect
+
+describe('Test a videos search', function () {
+ let server: ServerInfo = null
+ let startDate: string
+
+ before(async function () {
+ this.timeout(30000)
+
+ await flushTests()
+
+ server = await runServer(1)
+
+ await setAccessTokensToServers([ server ])
+
+ {
+ const attributes1 = {
+ name: '1111 2222 3333',
+ fixture: '60fps_720p_small.mp4', // 2 seconds
+ category: 1,
+ licence: 1,
+ nsfw: false,
+ language: 'fr'
+ }
+ await uploadVideo(server.url, server.accessToken, attributes1)
+
+ const attributes2 = immutableAssign(attributes1, { name: attributes1.name + ' - 2', fixture: 'video_short.mp4' })
+ await uploadVideo(server.url, server.accessToken, attributes2)
+
+ const attributes3 = immutableAssign(attributes1, { name: attributes1.name + ' - 3', language: 'en' })
+ await uploadVideo(server.url, server.accessToken, attributes3)
+
+ const attributes4 = immutableAssign(attributes1, { name: attributes1.name + ' - 4', language: 'pl', nsfw: true })
+ await uploadVideo(server.url, server.accessToken, attributes4)
+
+ await wait(1000)
+
+ startDate = new Date().toISOString()
+
+ const attributes5 = immutableAssign(attributes1, { name: attributes1.name + ' - 5', licence: 2 })
+ await uploadVideo(server.url, server.accessToken, attributes5)
+
+ const attributes6 = immutableAssign(attributes1, { name: attributes1.name + ' - 6', tags: [ 't1', 't2 '] })
+ await uploadVideo(server.url, server.accessToken, attributes6)
+
+ const attributes7 = immutableAssign(attributes1, { name: attributes1.name + ' - 7' })
+ await uploadVideo(server.url, server.accessToken, attributes7)
+
+ const attributes8 = immutableAssign(attributes1, { name: attributes1.name + ' - 8', licence: 4 })
+ await uploadVideo(server.url, server.accessToken, attributes8)
+ }
+
+ {
+ const attributes = {
+ name: '3333 4444 5555',
+ fixture: 'video_short.mp4',
+ category: 2,
+ licence: 2,
+ language: 'en'
+ }
+ await uploadVideo(server.url, server.accessToken, attributes)
+
+ await uploadVideo(server.url, server.accessToken, immutableAssign(attributes, { name: attributes.name + ' duplicate' }))
+ }
+
+ {
+ const attributes = {
+ name: '6666 7777 8888',
+ fixture: 'video_short.mp4',
+ category: 3,
+ licence: 3,
+ language: 'pl'
+ }
+ await uploadVideo(server.url, server.accessToken, attributes)
+ }
+
+ {
+ const attributes1 = {
+ name: '9999',
+ tags: [ 'aaaa', 'bbbb', 'cccc' ],
+ category: 1
+ }
+ await uploadVideo(server.url, server.accessToken, attributes1)
+ await uploadVideo(server.url, server.accessToken, immutableAssign(attributes1, { category: 2 }))
+
+ await uploadVideo(server.url, server.accessToken, immutableAssign(attributes1, { tags: [ 'cccc', 'dddd' ] }))
+ await uploadVideo(server.url, server.accessToken, immutableAssign(attributes1, { tags: [ 'eeee', 'ffff' ] }))
+ }
+ })
+
+ it('Should make a simple search and not have results', async function () {
+ const res = await searchVideo(server.url, 'abc')
+
+ expect(res.body.total).to.equal(0)
+ expect(res.body.data).to.have.lengthOf(0)
+ })
+
+ it('Should make a simple search and have results', async function () {
+ const res = await searchVideo(server.url, '4444 5555 duplicate')
+
+ expect(res.body.total).to.equal(2)
+
+ const videos = res.body.data
+ expect(videos).to.have.lengthOf(2)
+
+ // bestmatch
+ expect(videos[0].name).to.equal('3333 4444 5555 duplicate')
+ expect(videos[1].name).to.equal('3333 4444 5555')
+ })
+
+ it('Should search by tags (one of)', async function () {
+ const query = {
+ search: '9999',
+ categoryOneOf: [ 1 ],
+ tagsOneOf: [ 'aaaa', 'ffff' ]
+ }
+ const res1 = await advancedVideosSearch(server.url, query)
+ expect(res1.body.total).to.equal(2)
+
+ const res2 = await advancedVideosSearch(server.url, immutableAssign(query, { tagsOneOf: [ 'blabla' ] }))
+ expect(res2.body.total).to.equal(0)
+ })
+
+ it('Should search by tags (all of)', async function () {
+ const query = {
+ search: '9999',
+ categoryOneOf: [ 1 ],
+ tagsAllOf: [ 'cccc' ]
+ }
+ const res1 = await advancedVideosSearch(server.url, query)
+ expect(res1.body.total).to.equal(2)
+
+ const res2 = await advancedVideosSearch(server.url, immutableAssign(query, { tagsAllOf: [ 'blabla' ] }))
+ expect(res2.body.total).to.equal(0)
+
+ const res3 = await advancedVideosSearch(server.url, immutableAssign(query, { tagsAllOf: [ 'bbbb', 'cccc' ] }))
+ expect(res3.body.total).to.equal(1)
+ })
+
+ it('Should search by category', async function () {
+ const query = {
+ search: '6666',
+ categoryOneOf: [ 3 ]
+ }
+ const res1 = await advancedVideosSearch(server.url, query)
+ expect(res1.body.total).to.equal(1)
+ expect(res1.body.data[0].name).to.equal('6666 7777 8888')
+
+ const res2 = await advancedVideosSearch(server.url, immutableAssign(query, { categoryOneOf: [ 2 ] }))
+ expect(res2.body.total).to.equal(0)
+ })
+
+ it('Should search by licence', async function () {
+ const query = {
+ search: '4444 5555',
+ licenceOneOf: [ 2 ]
+ }
+ const res1 = await advancedVideosSearch(server.url, query)
+ expect(res1.body.total).to.equal(2)
+ expect(res1.body.data[0].name).to.equal('3333 4444 5555')
+ expect(res1.body.data[1].name).to.equal('3333 4444 5555 duplicate')
+
+ const res2 = await advancedVideosSearch(server.url, immutableAssign(query, { licenceOneOf: [ 3 ] }))
+ expect(res2.body.total).to.equal(0)
+ })
+
+ it('Should search by languages', async function () {
+ const query = {
+ search: '1111 2222 3333',
+ languageOneOf: [ 'pl', 'en' ]
+ }
+ const res1 = await advancedVideosSearch(server.url, query)
+ expect(res1.body.total).to.equal(2)
+ expect(res1.body.data[0].name).to.equal('1111 2222 3333 - 3')
+ expect(res1.body.data[1].name).to.equal('1111 2222 3333 - 4')
+
+ const res2 = await advancedVideosSearch(server.url, immutableAssign(query, { languageOneOf: [ 'eo' ] }))
+ expect(res2.body.total).to.equal(0)
+ })
+
+ it('Should search by start date', async function () {
+ const query = {
+ search: '1111 2222 3333',
+ startDate
+ }
+
+ const res = await advancedVideosSearch(server.url, query)
+ expect(res.body.total).to.equal(4)
+
+ const videos = res.body.data
+ expect(videos[0].name).to.equal('1111 2222 3333 - 5')
+ expect(videos[1].name).to.equal('1111 2222 3333 - 6')
+ expect(videos[2].name).to.equal('1111 2222 3333 - 7')
+ expect(videos[3].name).to.equal('1111 2222 3333 - 8')
+ })
+
+ it('Should make an advanced search', async function () {
+ const query = {
+ search: '1111 2222 3333',
+ languageOneOf: [ 'pl', 'fr' ],
+ durationMax: 4,
+ nsfw: false,
+ licenceOneOf: [ 1, 4 ]
+ }
+
+ const res = await advancedVideosSearch(server.url, query)
+ expect(res.body.total).to.equal(4)
+
+ const videos = res.body.data
+ expect(videos[0].name).to.equal('1111 2222 3333')
+ expect(videos[1].name).to.equal('1111 2222 3333 - 6')
+ expect(videos[2].name).to.equal('1111 2222 3333 - 7')
+ expect(videos[3].name).to.equal('1111 2222 3333 - 8')
+ })
+
+ it('Should make an advanced search and sort results', async function () {
+ const query = {
+ search: '1111 2222 3333',
+ languageOneOf: [ 'pl', 'fr' ],
+ durationMax: 4,
+ nsfw: false,
+ licenceOneOf: [ 1, 4 ],
+ sort: '-name'
+ }
+
+ const res = await advancedVideosSearch(server.url, query)
+ expect(res.body.total).to.equal(4)
+
+ const videos = res.body.data
+ expect(videos[0].name).to.equal('1111 2222 3333 - 8')
+ expect(videos[1].name).to.equal('1111 2222 3333 - 7')
+ expect(videos[2].name).to.equal('1111 2222 3333 - 6')
+ expect(videos[3].name).to.equal('1111 2222 3333')
+ })
+
+ it('Should make an advanced search and only show the first result', async function () {
+ const query = {
+ search: '1111 2222 3333',
+ languageOneOf: [ 'pl', 'fr' ],
+ durationMax: 4,
+ nsfw: false,
+ licenceOneOf: [ 1, 4 ],
+ sort: '-name',
+ start: 0,
+ count: 1
+ }
+
+ const res = await advancedVideosSearch(server.url, query)
+ expect(res.body.total).to.equal(4)
+
+ const videos = res.body.data
+ expect(videos[0].name).to.equal('1111 2222 3333 - 8')
+ })
+
+ it('Should make an advanced search and only show the last result', async function () {
+ const query = {
+ search: '1111 2222 3333',
+ languageOneOf: [ 'pl', 'fr' ],
+ durationMax: 4,
+ nsfw: false,
+ licenceOneOf: [ 1, 4 ],
+ sort: '-name',
+ start: 3,
+ count: 1
+ }
+
+ const res = await advancedVideosSearch(server.url, query)
+ expect(res.body.total).to.equal(4)
+
+ const videos = res.body.data
+ expect(videos[0].name).to.equal('1111 2222 3333')
+ })
+
+ after(async function () {
+ killallServers([ server ])
+
+ // Keep the logs if the test failed
+ if (this['ok']) {
+ await flushTests()
+ }
+ })
+})
getVideosList,
getVideosListPagination,
getVideosListSort,
+ getVideosWithFilters,
killallServers,
rateVideo,
removeVideo,
runServer,
- searchVideo,
- searchVideoWithPagination,
- searchVideoWithSort,
ServerInfo,
setAccessTokensToServers,
testImage,
expect(video.views).to.equal(3)
})
- it('Should search the video by name', async function () {
- const res = await searchVideo(server.url, 'my')
-
- expect(res.body.total).to.equal(1)
- expect(res.body.data).to.be.an('array')
- expect(res.body.data.length).to.equal(1)
-
- const video = res.body.data[0]
- await completeVideoCheck(server.url, video, getCheckAttributes)
- })
-
- // Not implemented yet
- // it('Should search the video by tag', async function () {
- // const res = await searchVideo(server.url, 'tag1')
- //
- // expect(res.body.total).to.equal(1)
- // expect(res.body.data).to.be.an('array')
- // expect(res.body.data.length).to.equal(1)
- //
- // const video = res.body.data[0]
- // expect(video.name).to.equal('my super name')
- // expect(video.category).to.equal(2)
- // expect(video.categoryLabel).to.equal('Films')
- // expect(video.licence).to.equal(6)
- // expect(video.licenceLabel).to.equal('Attribution - Non Commercial - No Derivatives')
- // expect(video.language).to.equal('zh')
- // expect(video.languageLabel).to.equal('Chinese')
- // expect(video.nsfw).to.be.ok
- // expect(video.description).to.equal('my super description')
- // expect(video.account.name).to.equal('root')
- // expect(video.account.host).to.equal('localhost:9001')
- // expect(video.isLocal).to.be.true
- // expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'tag3' ])
- // expect(dateIsValid(video.createdAt)).to.be.true
- // expect(dateIsValid(video.updatedAt)).to.be.true
- //
- // const test = await testVideoImage(server.url, 'video_short.webm', video.thumbnailPath)
- // expect(test).to.equal(true)
- // })
-
- it('Should not find a search by name', async function () {
- const res = await searchVideo(server.url, 'hello')
-
- expect(res.body.total).to.equal(0)
- expect(res.body.data).to.be.an('array')
- expect(res.body.data.length).to.equal(0)
- })
-
- // Not implemented yet
- // it('Should not find a search by author', async function () {
- // const res = await searchVideo(server.url, 'hello')
- //
- // expect(res.body.total).to.equal(0)
- // expect(res.body.data).to.be.an('array')
- // expect(res.body.data.length).to.equal(0)
- // })
- //
- // Not implemented yet
- // it('Should not find a search by tag', async function () {
- // const res = await searchVideo(server.url, 'hello')
- //
- // expect(res.body.total).to.equal(0)
- // expect(res.body.data).to.be.an('array')
- // expect(res.body.data.length).to.equal(0)
- // })
-
it('Should remove the video', async function () {
await removeVideo(server.url, server.accessToken, videoId)
expect(videos[0].name).to.equal(videosListBase[5].name)
})
- it('Should search the first video', async function () {
- const res = await searchVideoWithPagination(server.url, 'webm', 0, 1, 'name')
-
- const videos = res.body.data
- expect(res.body.total).to.equal(4)
- expect(videos.length).to.equal(1)
- expect(videos[0].name).to.equal('video_short1.webm name')
- })
-
- it('Should search the last two videos', async function () {
- const res = await searchVideoWithPagination(server.url, 'webm', 2, 2, 'name')
-
- const videos = res.body.data
- expect(res.body.total).to.equal(4)
- expect(videos.length).to.equal(2)
- expect(videos[0].name).to.equal('video_short3.webm name')
- expect(videos[1].name).to.equal('video_short.webm name')
- })
-
- it('Should search all the webm videos', async function () {
- const res = await searchVideoWithPagination(server.url, 'webm', 0, 15)
-
- const videos = res.body.data
- expect(res.body.total).to.equal(4)
- expect(videos.length).to.equal(4)
- })
-
- // Not implemented yet
- // it('Should search all the root author videos', async function () {
- // const res = await searchVideoWithPagination(server.url, 'root', 0, 15)
- //
- // const videos = res.body.data
- // expect(res.body.total).to.equal(6)
- // expect(videos.length).to.equal(6)
- // })
-
- // Not implemented yet
- // it('Should search all the 9001 port videos', async function () {
- // const res = await videosUtils.searchVideoWithPagination(server.url, '9001', 'host', 0, 15)
-
- // const videos = res.body.data
- // expect(res.body.total).to.equal(6)
- // expect(videos.length).to.equal(6)
-
- // done()
- // })
- // })
-
- // it('Should search all the localhost videos', async function () {
- // const res = await videosUtils.searchVideoWithPagination(server.url, 'localhost', 'host', 0, 15)
-
- // const videos = res.body.data
- // expect(res.body.total).to.equal(6)
- // expect(videos.length).to.equal(6)
-
- // done()
- // })
- // })
-
it('Should list and sort by name in descending order', async function () {
const res = await getVideosListSort(server.url, '-name')
expect(videos[3].name).to.equal('video_short3.webm name')
expect(videos[4].name).to.equal('video_short2.webm name')
expect(videos[5].name).to.equal('video_short1.webm name')
- })
-
- it('Should search and sort by name in ascending order', async function () {
- const res = await searchVideoWithSort(server.url, 'webm', 'name')
- const videos = res.body.data
- expect(res.body.total).to.equal(4)
- expect(videos.length).to.equal(4)
-
- expect(videos[0].name).to.equal('video_short1.webm name')
- expect(videos[1].name).to.equal('video_short2.webm name')
- expect(videos[2].name).to.equal('video_short3.webm name')
- expect(videos[3].name).to.equal('video_short.webm name')
-
- videoId = videos[2].id
+ videoId = videos[3].uuid
})
it('Should update a video', async function () {
await updateVideo(server.url, server.accessToken, videoId, attributes)
})
+ it('Should filter by tags and category', async function () {
+ const res1 = await getVideosWithFilters(server.url, { tagsAllOf: [ 'tagup1', 'tagup2' ], categoryOneOf: 4 })
+ expect(res1.body.total).to.equal(1)
+ expect(res1.body.data[0].name).to.equal('my super video updated')
+
+ const res2 = await getVideosWithFilters(server.url, { tagsAllOf: [ 'tagup1', 'tagup2' ], categoryOneOf: 3 })
+ expect(res2.body.total).to.equal(0)
+ })
+
it('Should have the video updated', async function () {
this.timeout(60000)
let userAccessToken: string
let customConfig: CustomConfig
- function getVideosFunctions (token?: string) {
+ function getVideosFunctions (token?: string, query = {}) {
return getMyUserInformation(server.url, server.accessToken)
.then(res => {
const user: User = res.body
if (token) {
return Promise.all([
- getVideosListWithToken(server.url, token),
- searchVideoWithToken(server.url, 'n', token),
- getAccountVideos(server.url, token, accountName, 0, 5),
- getVideoChannelVideos(server.url, token, videoChannelUUID, 0, 5)
+ getVideosListWithToken(server.url, token, query),
+ searchVideoWithToken(server.url, 'n', token, query),
+ getAccountVideos(server.url, token, accountName, 0, 5, undefined, query),
+ getVideoChannelVideos(server.url, token, videoChannelUUID, 0, 5, undefined, query)
])
}
expect(videos[ 0 ].name).to.equal('normal')
expect(videos[ 1 ].name).to.equal('nsfw')
})
+
+ it('Should display NSFW videos when the nsfw param === true', async function () {
+ for (const res of await getVideosFunctions(server.accessToken, { nsfw: true })) {
+ expect(res.body.total).to.equal(1)
+
+ const videos = res.body.data
+ expect(videos).to.have.lengthOf(1)
+ expect(videos[ 0 ].name).to.equal('nsfw')
+ }
+ })
+
+ it('Should hide NSFW videos when the nsfw param === true', async function () {
+ for (const res of await getVideosFunctions(server.accessToken, { nsfw: false })) {
+ expect(res.body.total).to.equal(1)
+
+ const videos = res.body.data
+ expect(videos).to.have.lengthOf(1)
+ expect(videos[ 0 ].name).to.equal('normal')
+ }
+ })
})
after(async function () {
export * from './videos/video-channels'
export * from './videos/videos'
export * from './feeds/feeds'
+export * from './search/videos'
import { makeGetRequest } from './requests'
+import { immutableAssign } from '..'
-function checkBadStartPagination (url: string, path: string, token?: string) {
+function checkBadStartPagination (url: string, path: string, token?: string, query = {}) {
return makeGetRequest({
url,
path,
token,
- query: { start: 'hello' },
+ query: immutableAssign(query, { start: 'hello' }),
statusCodeExpected: 400
})
}
-function checkBadCountPagination (url: string, path: string, token?: string) {
+function checkBadCountPagination (url: string, path: string, token?: string, query = {}) {
return makeGetRequest({
url,
path,
token,
- query: { count: 'hello' },
+ query: immutableAssign(query, { count: 'hello' }),
statusCodeExpected: 400
})
}
-function checkBadSortPagination (url: string, path: string, token?: string) {
+function checkBadSortPagination (url: string, path: string, token?: string, query = {}) {
return makeGetRequest({
url,
path,
token,
- query: { sort: 'hello' },
+ query: immutableAssign(query, { sort: 'hello' }),
statusCodeExpected: 400
})
}
--- /dev/null
+/* tslint:disable:no-unused-expression */
+
+import * as request from 'supertest'
+import { VideosSearchQuery } from '../../../../shared/models/search'
+import { immutableAssign } from '..'
+
+function searchVideo (url: string, search: string) {
+ const path = '/api/v1/search/videos'
+ const req = request(url)
+ .get(path)
+ .query({ sort: '-publishedAt', search })
+ .set('Accept', 'application/json')
+
+ return req.expect(200)
+ .expect('Content-Type', /json/)
+}
+
+function searchVideoWithToken (url: string, search: string, token: string, query: { nsfw?: boolean } = {}) {
+ const path = '/api/v1/search/videos'
+ const req = request(url)
+ .get(path)
+ .set('Authorization', 'Bearer ' + token)
+ .query(immutableAssign(query, { sort: '-publishedAt', search }))
+ .set('Accept', 'application/json')
+
+ return req.expect(200)
+ .expect('Content-Type', /json/)
+}
+
+function searchVideoWithPagination (url: string, search: string, start: number, count: number, sort?: string) {
+ const path = '/api/v1/search/videos'
+
+ const req = request(url)
+ .get(path)
+ .query({ start })
+ .query({ search })
+ .query({ count })
+
+ if (sort) req.query({ sort })
+
+ return req.set('Accept', 'application/json')
+ .expect(200)
+ .expect('Content-Type', /json/)
+}
+
+function searchVideoWithSort (url: string, search: string, sort: string) {
+ const path = '/api/v1/search/videos'
+
+ return request(url)
+ .get(path)
+ .query({ search })
+ .query({ sort })
+ .set('Accept', 'application/json')
+ .expect(200)
+ .expect('Content-Type', /json/)
+}
+
+function advancedVideosSearch (url: string, options: VideosSearchQuery) {
+ const path = '/api/v1/search/videos'
+
+ return request(url)
+ .get(path)
+ .query(options)
+ .set('Accept', 'application/json')
+ .expect(200)
+ .expect('Content-Type', /json/)
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+ searchVideo,
+ advancedVideosSearch,
+ searchVideoWithToken,
+ searchVideoWithPagination,
+ searchVideoWithSort
+}
import * as request from 'supertest'
import {
buildAbsoluteFixturePath,
- getMyUserInformation,
+ getMyUserInformation, immutableAssign,
makeGetRequest,
makePutBodyRequest,
makeUploadRequest,
.expect('Content-Type', /json/)
}
-function getVideosListWithToken (url: string, token: string) {
+function getVideosListWithToken (url: string, token: string, query: { nsfw?: boolean } = {}) {
const path = '/api/v1/videos'
return request(url)
.get(path)
.set('Authorization', 'Bearer ' + token)
- .query({ sort: 'name' })
+ .query(immutableAssign(query, { sort: 'name' }))
.set('Accept', 'application/json')
.expect(200)
.expect('Content-Type', /json/)
.expect('Content-Type', /json/)
}
-function getAccountVideos (url: string, accessToken: string, accountName: string, start: number, count: number, sort?: string) {
+function getAccountVideos (
+ url: string,
+ accessToken: string,
+ accountName: string,
+ start: number,
+ count: number,
+ sort?: string,
+ query: { nsfw?: boolean } = {}
+) {
const path = '/api/v1/accounts/' + accountName + '/videos'
return makeGetRequest({
url,
path,
- query: {
+ query: immutableAssign(query, {
start,
count,
sort
- },
+ }),
token: accessToken,
statusCodeExpected: 200
})
videoChannelId: number | string,
start: number,
count: number,
- sort?: string
+ sort?: string,
+ query: { nsfw?: boolean } = {}
) {
const path = '/api/v1/video-channels/' + videoChannelId + '/videos'
return makeGetRequest({
url,
path,
- query: {
+ query: immutableAssign(query, {
start,
count,
sort
- },
+ }),
token: accessToken,
statusCodeExpected: 200
})
.expect('Content-Type', /json/)
}
-function removeVideo (url: string, token: string, id: number | string, expectedStatus = 204) {
+function getVideosWithFilters (url: string, query: { tagsAllOf: string[], categoryOneOf: number[] | number }) {
const path = '/api/v1/videos'
return request(url)
- .delete(path + '/' + id)
- .set('Accept', 'application/json')
- .set('Authorization', 'Bearer ' + token)
- .expect(expectedStatus)
-}
-
-function searchVideo (url: string, search: string) {
- const path = '/api/v1/search/videos'
- const req = request(url)
.get(path)
- .query({ search })
+ .query(query)
.set('Accept', 'application/json')
-
- return req.expect(200)
+ .expect(200)
.expect('Content-Type', /json/)
}
-function searchVideoWithToken (url: string, search: string, token: string) {
+function removeVideo (url: string, token: string, id: number | string, expectedStatus = 204) {
const path = '/api/v1/videos'
- const req = request(url)
- .get(path + '/search')
- .set('Authorization', 'Bearer ' + token)
- .query({ search })
- .set('Accept', 'application/json')
-
- return req.expect(200)
- .expect('Content-Type', /json/)
-}
-
-function searchVideoWithPagination (url: string, search: string, start: number, count: number, sort?: string) {
- const path = '/api/v1/search/videos'
-
- const req = request(url)
- .get(path)
- .query({ start })
- .query({ search })
- .query({ count })
-
- if (sort) req.query({ sort })
-
- return req.set('Accept', 'application/json')
- .expect(200)
- .expect('Content-Type', /json/)
-}
-
-function searchVideoWithSort (url: string, search: string, sort: string) {
- const path = '/api/v1/search/videos'
return request(url)
- .get(path)
- .query({ search })
- .query({ sort })
+ .delete(path + '/' + id)
.set('Accept', 'application/json')
- .expect(200)
- .expect('Content-Type', /json/)
+ .set('Authorization', 'Bearer ' + token)
+ .expect(expectedStatus)
}
async function checkVideoFilesWereRemoved (videoUUID: string, serverNumber: number) {
getMyVideos,
getAccountVideos,
getVideoChannelVideos,
- searchVideoWithToken,
getVideo,
getVideoWithToken,
getVideosList,
getVideosListPagination,
getVideosListSort,
removeVideo,
- searchVideo,
- searchVideoWithPagination,
- searchVideoWithSort,
getVideosListWithToken,
uploadVideo,
+ getVideosWithFilters,
updateVideo,
rateVideo,
viewVideo,
export * from './videos'
export * from './feeds'
export * from './i18n'
+export * from './search'
export * from './server/job.model'
export * from './oauth-client-local.model'
export * from './result-list.model'
--- /dev/null
+export * from './videos-search-query.model'
--- /dev/null
+export interface VideosSearchQuery {
+ search: string
+
+ start?: number
+ count?: number
+ sort?: string
+
+ startDate?: string // ISO 8601
+ endDate?: string // ISO 8601
+
+ nsfw?: boolean
+
+ categoryOneOf?: number[]
+
+ licenceOneOf?: number[]
+
+ languageOneOf?: string[]
+
+ tagsOneOf?: string[]
+ tagsAllOf?: string[]
+
+ durationMin?: number // seconds
+ durationMax?: number // seconds
+}
projects / oweals / peertube.git / commitdiff