Deprecate filter video query

Introduce include and isLocal instead

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 @@
-import { VideoFilter } from '../videos'
+import { VideoInclude } from '../videos/video-include.enum'
 import { BooleanBothQuery } from './boolean-both-query.model'
 
 // These query parameters can be used with any endpoint that list videos
@@ -11,6 +11,12 @@ export interface VideosCommonQuery {
 
   isLive?: boolean
 
+  // FIXME: deprecated in 4.0 in favour of isLocal and include, to remove
+  filter?: never
+
+  isLocal?: boolean
+  include?: VideoInclude
+
   categoryOneOf?: number[]
 
   licenceOneOf?: number[]
@@ -20,17 +26,16 @@ export interface VideosCommonQuery {
   tagsOneOf?: string[]
   tagsAllOf?: string[]
 
-  filter?: VideoFilter
-
   skipCount?: boolean
+
+  search?: string
 }
 
 export interface VideosCommonQueryAfterSanitize extends VideosCommonQuery {
   start: number
   count: number
   sort: string
-}
 
-export interface VideosWithSearchCommonQuery extends VideosCommonQuery {
-  search?: string
+  // FIXME: deprecated in 4.0, to remove
+  filter?: never
 }
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 {
   start: number
   count: number
   sort: string
+
+  // FIXME: deprecated in 4.0, to remove
+  filter?: never
 }