diff options
Diffstat (limited to 'server/helpers')
-rw-r--r-- | server/helpers/custom-validators/metrics.ts | 3 | ||||
-rw-r--r-- | server/helpers/custom-validators/video-transcoding.ts | 2 | ||||
-rw-r--r-- | server/helpers/query.ts | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/server/helpers/custom-validators/metrics.ts b/server/helpers/custom-validators/metrics.ts index 533f8988d..44a863630 100644 --- a/server/helpers/custom-validators/metrics.ts +++ b/server/helpers/custom-validators/metrics.ts | |||
@@ -1,5 +1,6 @@ | |||
1 | function isValidPlayerMode (value: any) { | 1 | function isValidPlayerMode (value: any) { |
2 | return value === 'webtorrent' || value === 'p2p-media-loader' | 2 | // TODO: remove webtorrent in v7 |
3 | return value === 'webtorrent' || value === 'web-video' || value === 'p2p-media-loader' | ||
3 | } | 4 | } |
4 | 5 | ||
5 | // --------------------------------------------------------------------------- | 6 | // --------------------------------------------------------------------------- |
diff --git a/server/helpers/custom-validators/video-transcoding.ts b/server/helpers/custom-validators/video-transcoding.ts index cf792f996..220530de4 100644 --- a/server/helpers/custom-validators/video-transcoding.ts +++ b/server/helpers/custom-validators/video-transcoding.ts | |||
@@ -2,7 +2,7 @@ import { exists } from './misc' | |||
2 | 2 | ||
3 | function isValidCreateTranscodingType (value: any) { | 3 | function isValidCreateTranscodingType (value: any) { |
4 | return exists(value) && | 4 | return exists(value) && |
5 | (value === 'hls' || value === 'webtorrent') | 5 | (value === 'hls' || value === 'webtorrent' || value === 'web-video') // TODO: remove webtorrent in v7 |
6 | } | 6 | } |
7 | 7 | ||
8 | // --------------------------------------------------------------------------- | 8 | // --------------------------------------------------------------------------- |
diff --git a/server/helpers/query.ts b/server/helpers/query.ts index 10efae41c..c0f78368f 100644 --- a/server/helpers/query.ts +++ b/server/helpers/query.ts | |||
@@ -23,7 +23,8 @@ function pickCommonVideoQuery (query: VideosCommonQueryAfterSanitize) { | |||
23 | 'include', | 23 | 'include', |
24 | 'skipCount', | 24 | 'skipCount', |
25 | 'hasHLSFiles', | 25 | 'hasHLSFiles', |
26 | 'hasWebtorrentFiles', | 26 | 'hasWebtorrentFiles', // TODO: Remove in v7 |
27 | 'hasWebVideoFiles', | ||
27 | 'search', | 28 | 'search', |
28 | 'excludeAlreadyWatched' | 29 | 'excludeAlreadyWatched' |
29 | ]) | 30 | ]) |