Merge branch 'release/3.3.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 bd6bb5bc125f67f158db30e2ad6bef35aaee693f..a5436879d5fda9ecd50b3cf2ab8d2f47ef454511 100644 (file)
--- a/shared/models/search/videos-search-query.model.ts
+++ b/shared/models/search/videos-search-query.model.ts
@@ -1,15 +1,10 @@
-import { NSFWQuery } from './nsfw-query.model'
-import { VideoFilter } from '../videos'
 import { SearchTargetQuery } from './search-target-query.model'
+import { VideosCommonQuery } from './videos-common-query.model'
 
-export interface VideosSearchQuery extends SearchTargetQuery {
-  forceLocalSearch?: boolean
-
+export interface VideosSearchQuery extends SearchTargetQuery, VideosCommonQuery {
   search?: string
 
-  start?: number
-  count?: number
-  sort?: string
+  host?: string
 
   startDate?: string // ISO 8601
   endDate?: string // ISO 8601
@@ -17,19 +12,15 @@ export interface VideosSearchQuery extends SearchTargetQuery {
   originallyPublishedStartDate?: string // ISO 8601
   originallyPublishedEndDate?: string // ISO 8601
 
-  nsfw?: NSFWQuery
-
-  categoryOneOf?: number[]
-
-  licenceOneOf?: number[]
-
-  languageOneOf?: string[]
-
-  tagsOneOf?: string[]
-  tagsAllOf?: string[]
-
   durationMin?: number // seconds
   durationMax?: number // seconds
 
-  filter?: VideoFilter
+  // UUIDs or short UUIDs
+  uuids?: string[]
+}
+
+export interface VideosSearchQueryAfterSanitize extends VideosSearchQuery {
+  start: number
+  count: number
+  sort: string
 }