Merge remote-tracking branch 'weblate/develop' 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 0db220758286d7a9f1d1da6eecabcaad81ccfa7b..406f6cab22b808dec9d456b48c358c2ef3c199a5 100644 (file)
--- a/shared/models/search/videos-search-query.model.ts
+++ b/shared/models/search/videos-search-query.model.ts
@@ -1,29 +1,15 @@
-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
-
   startDate?: string // ISO 8601
   endDate?: string // ISO 8601
 
-  nsfw?: NSFWQuery
-
-  categoryOneOf?: number[]
-
-  licenceOneOf?: number[]
-
-  languageOneOf?: string[]
-
-  tagsOneOf?: string[]
-  tagsAllOf?: string[]
+  originallyPublishedStartDate?: string // ISO 8601
+  originallyPublishedEndDate?: string // ISO 8601
 
   durationMin?: number // seconds
   durationMax?: number // seconds
-
-  filter?: VideoFilter
 }