Prefer web videos in favour of webtorrent

5 files changed, 10 insertions, 12 deletions

diff --git a/shared/models/search/videos-common-query.model.ts b/shared/models/search/videos-common-query.model.ts
index da479c928..2c52ca8cf 100644
--- a/shared/models/search/videos-common-query.model.ts
+++ b/shared/models/search/videos-common-query.model.ts
@@ -30,7 +30,9 @@ export interface VideosCommonQuery {
   tagsAllOf?: string[]
 
   hasHLSFiles?: boolean
-  hasWebtorrentFiles?: boolean
+
+  hasWebtorrentFiles?: boolean // TODO: remove in v7
+  hasWebVideoFiles?: boolean
 
   skipCount?: boolean
 
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts
index 9c40079fb..c14806dab 100644
--- a/shared/models/server/job.model.ts
+++ b/shared/models/server/job.model.ts
@@ -148,17 +148,17 @@ export interface HLSTranscodingPayload extends BaseTranscodingPayload {
   fps: number
   copyCodecs: boolean
 
-  deleteWebTorrentFiles: boolean
+  deleteWebVideoFiles: boolean
 }
 
-export interface NewWebTorrentResolutionTranscodingPayload extends BaseTranscodingPayload {
-  type: 'new-resolution-to-webtorrent'
+export interface NewWebVideoResolutionTranscodingPayload extends BaseTranscodingPayload {
+  type: 'new-resolution-to-web-video'
   resolution: VideoResolution
   fps: number
 }
 
 export interface MergeAudioTranscodingPayload extends BaseTranscodingPayload {
-  type: 'merge-audio-to-webtorrent'
+  type: 'merge-audio-to-web-video'
 
   resolution: VideoResolution
   fps: number
@@ -167,7 +167,7 @@ export interface MergeAudioTranscodingPayload extends BaseTranscodingPayload {
 }
 
 export interface OptimizeTranscodingPayload extends BaseTranscodingPayload {
-  type: 'optimize-to-webtorrent'
+  type: 'optimize-to-web-video'
 
   quickTranscode: boolean
 
@@ -176,7 +176,7 @@ export interface OptimizeTranscodingPayload extends BaseTranscodingPayload {
 
 export type VideoTranscodingPayload =
   HLSTranscodingPayload
-  | NewWebTorrentResolutionTranscodingPayload
+  | NewWebVideoResolutionTranscodingPayload
   | OptimizeTranscodingPayload
   | MergeAudioTranscodingPayload
 
diff --git a/shared/models/users/user-update-me.model.ts b/shared/models/users/user-update-me.model.ts
index f3cceb5f2..c1d5ffba4 100644
--- a/shared/models/users/user-update-me.model.ts
+++ b/shared/models/users/user-update-me.model.ts
@@ -5,8 +5,6 @@ export interface UserUpdateMe {
   description?: string
   nsfwPolicy?: NSFWPolicyType
 
-  // FIXME: deprecated in favour of p2pEnabled in 4.1
-  webTorrentEnabled?: boolean
   p2pEnabled?: boolean
 
   autoPlayVideo?: boolean
diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts
index 0761c1e32..9de4118b4 100644
--- a/shared/models/users/user.model.ts
+++ b/shared/models/users/user.model.ts
@@ -22,8 +22,6 @@ export interface User {
   autoPlayNextVideo: boolean
   autoPlayNextVideoPlaylist: boolean
 
-  // @deprecated in favour of p2pEnabled
-  webTorrentEnabled: boolean
   p2pEnabled: boolean
 
   videosHistoryEnabled: boolean
diff --git a/shared/models/videos/transcoding/video-transcoding-create.model.ts b/shared/models/videos/transcoding/video-transcoding-create.model.ts
index aeb393e57..c6e756a0a 100644
--- a/shared/models/videos/transcoding/video-transcoding-create.model.ts
+++ b/shared/models/videos/transcoding/video-transcoding-create.model.ts
@@ -1,3 +1,3 @@
 export interface VideoTranscodingCreate {
-  transcodingType: 'hls' | 'webtorrent'
+  transcodingType: 'hls' | 'webtorrent' | 'web-video' // TODO: remove webtorrent in v7
 }