X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Fmodels%2Fsearch%2Fvideos-search-query.model.ts;h=447c72806f27cc1386437b0a5db144c5ea9bbc35;hb=901bcf5c188ea79350fecd499ad76460b866617b;hp=838063095dfabf7b55134fcff4ec12ca3fa99fce;hpb=97567dd81f508dd6295ac4d73d849aa2ce0a6549;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/shared/models/search/videos-search-query.model.ts b/shared/models/search/videos-search-query.model.ts
index 838063095..447c72806 100644
--- a/shared/models/search/videos-search-query.model.ts
+++ b/shared/models/search/videos-search-query.model.ts
@@ -1,12 +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 {
+export interface VideosSearchQuery extends SearchTargetQuery, VideosCommonQuery {
   search?: string
 
-  start?: number
-  count?: number
-  sort?: string
+  host?: string
 
   startDate?: string // ISO 8601
   endDate?: string // ISO 8601
@@ -14,19 +12,18 @@ export interface VideosSearchQuery {
   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
+
+  // FIXME: deprecated in 4.0, to remove
+  filter?: never
 }