diff options
Diffstat (limited to 'shared/models/search')
-rw-r--r-- | shared/models/search/videos-common-query.model.ts | 17 | ||||
-rw-r--r-- | shared/models/search/videos-search-query.model.ts | 3 |
2 files changed, 14 insertions, 6 deletions
diff --git a/shared/models/search/videos-common-query.model.ts b/shared/models/search/videos-common-query.model.ts index 2f2e9a934..55a98e302 100644 --- a/shared/models/search/videos-common-query.model.ts +++ b/shared/models/search/videos-common-query.model.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { VideoFilter } from '../videos' | 1 | import { VideoInclude } from '../videos/video-include.enum' |
2 | import { BooleanBothQuery } from './boolean-both-query.model' | 2 | import { BooleanBothQuery } from './boolean-both-query.model' |
3 | 3 | ||
4 | // These query parameters can be used with any endpoint that list videos | 4 | // These query parameters can be used with any endpoint that list videos |
@@ -11,6 +11,12 @@ export interface VideosCommonQuery { | |||
11 | 11 | ||
12 | isLive?: boolean | 12 | isLive?: boolean |
13 | 13 | ||
14 | // FIXME: deprecated in 4.0 in favour of isLocal and include, to remove | ||
15 | filter?: never | ||
16 | |||
17 | isLocal?: boolean | ||
18 | include?: VideoInclude | ||
19 | |||
14 | categoryOneOf?: number[] | 20 | categoryOneOf?: number[] |
15 | 21 | ||
16 | licenceOneOf?: number[] | 22 | licenceOneOf?: number[] |
@@ -20,17 +26,16 @@ export interface VideosCommonQuery { | |||
20 | tagsOneOf?: string[] | 26 | tagsOneOf?: string[] |
21 | tagsAllOf?: string[] | 27 | tagsAllOf?: string[] |
22 | 28 | ||
23 | filter?: VideoFilter | ||
24 | |||
25 | skipCount?: boolean | 29 | skipCount?: boolean |
30 | |||
31 | search?: string | ||
26 | } | 32 | } |
27 | 33 | ||
28 | export interface VideosCommonQueryAfterSanitize extends VideosCommonQuery { | 34 | export interface VideosCommonQueryAfterSanitize extends VideosCommonQuery { |
29 | start: number | 35 | start: number |
30 | count: number | 36 | count: number |
31 | sort: string | 37 | sort: string |
32 | } | ||
33 | 38 | ||
34 | export interface VideosWithSearchCommonQuery extends VideosCommonQuery { | 39 | // FIXME: deprecated in 4.0, to remove |
35 | search?: string | 40 | filter?: never |
36 | } | 41 | } |
diff --git a/shared/models/search/videos-search-query.model.ts b/shared/models/search/videos-search-query.model.ts index a5436879d..447c72806 100644 --- a/shared/models/search/videos-search-query.model.ts +++ b/shared/models/search/videos-search-query.model.ts | |||
@@ -23,4 +23,7 @@ export interface VideosSearchQueryAfterSanitize extends VideosSearchQuery { | |||
23 | start: number | 23 | start: number |
24 | count: number | 24 | count: number |
25 | sort: string | 25 | sort: string |
26 | |||
27 | // FIXME: deprecated in 4.0, to remove | ||
28 | filter?: never | ||
26 | } | 29 | } |