Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / shared / models / search / videos-search-query.model.ts

diff --git a/shared/models/search/videos-search-query.model.ts b/shared/models/search/videos-search-query.model.ts
index 29aa5c100c716c22ebc84e8aa252c3574635c024..447c72806f27cc1386437b0a5db144c5ea9bbc35 100644 (file)
--- a/shared/models/search/videos-search-query.model.ts
+++ b/shared/models/search/videos-search-query.model.ts
@@ -1,26 +1,29 @@
-import { NSFWQuery } from './nsfw-query.model'
+import { SearchTargetQuery } from './search-target-query.model'
+import { VideosCommonQuery } from './videos-common-query.model'
 
-export interface VideosSearchQuery {
+export interface VideosSearchQuery extends SearchTargetQuery, VideosCommonQuery {
   search?: string
 
-  start?: number
-  count?: number
-  sort?: string
+  host?: string
 
   startDate?: string // ISO 8601
   endDate?: string // ISO 8601
 
-  nsfw?: NSFWQuery
+  originallyPublishedStartDate?: string // ISO 8601
+  originallyPublishedEndDate?: string // ISO 8601
 
-  categoryOneOf?: number[]
-
-  licenceOneOf?: number[]
+  durationMin?: number // seconds
+  durationMax?: number // seconds
 
-  languageOneOf?: string[]
+  // UUIDs or short UUIDs
+  uuids?: string[]
+}
 
-  tagsOneOf?: string[]
-  tagsAllOf?: string[]
+export interface VideosSearchQueryAfterSanitize extends VideosSearchQuery {
+  start: number
+  count: number
+  sort: string
 
-  durationMin?: number // seconds
-  durationMax?: number // seconds
+  // FIXME: deprecated in 4.0, to remove
+  filter?: never
 }