3 files changed, 22 insertions, 18 deletions

diff --git a/server/middlewares/validators/static.ts b/server/middlewares/validators/static.ts
index 36a94080c..86cc0a8d7 100644
--- a/server/middlewares/validators/static.ts
+++ b/server/middlewares/validators/static.ts
@@ -22,7 +22,7 @@ const staticFileTokenBypass = new LRUCache<string, LRUValue>({
   ttl: LRU_CACHE.STATIC_VIDEO_FILES_RIGHTS_CHECK.TTL
 })
 
-const ensureCanAccessVideoPrivateWebTorrentFiles = [
+const ensureCanAccessVideoPrivateWebVideoFiles = [
   query('videoFileToken').optional().custom(exists),
 
   isValidVideoPasswordHeader(),
@@ -48,7 +48,7 @@ const ensureCanAccessVideoPrivateWebTorrentFiles = [
       return res.sendStatus(HttpStatusCode.FORBIDDEN_403)
     }
 
-    const result = await isWebTorrentAllowed(req, res)
+    const result = await isWebVideoAllowed(req, res)
 
     staticFileTokenBypass.set(cacheKey, result)
 
@@ -122,13 +122,13 @@ const ensureCanAccessPrivateVideoHLSFiles = [
 ]
 
 export {
-  ensureCanAccessVideoPrivateWebTorrentFiles,
+  ensureCanAccessVideoPrivateWebVideoFiles,
   ensureCanAccessPrivateVideoHLSFiles
 }
 
 // ---------------------------------------------------------------------------
 
-async function isWebTorrentAllowed (req: express.Request, res: express.Response) {
+async function isWebVideoAllowed (req: express.Request, res: express.Response) {
   const filename = basename(req.path)
 
   const file = await VideoFileModel.loadWithVideoByFilename(filename)
diff --git a/server/middlewares/validators/videos/video-files.ts b/server/middlewares/validators/videos/video-files.ts
index 92c5b9483..6c0ecda42 100644
--- a/server/middlewares/validators/videos/video-files.ts
+++ b/server/middlewares/validators/videos/video-files.ts
@@ -5,7 +5,7 @@ import { MVideo } from '@server/types/models'
 import { HttpStatusCode } from '@shared/models'
 import { areValidationErrors, doesVideoExist, isValidVideoIdParam } from '../shared'
 
-const videoFilesDeleteWebTorrentValidator = [
+const videoFilesDeleteWebVideoValidator = [
   isValidVideoIdParam('id'),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
@@ -16,17 +16,17 @@ const videoFilesDeleteWebTorrentValidator = [
 
     if (!checkLocalVideo(video, res)) return
 
-    if (!video.hasWebTorrentFiles()) {
+    if (!video.hasWebVideoFiles()) {
       return res.fail({
         status: HttpStatusCode.BAD_REQUEST_400,
-        message: 'This video does not have WebTorrent files'
+        message: 'This video does not have Web Video files'
       })
     }
 
     if (!video.getHLSPlaylist()) {
       return res.fail({
         status: HttpStatusCode.BAD_REQUEST_400,
-        message: 'Cannot delete WebTorrent files since this video does not have HLS playlist'
+        message: 'Cannot delete Web Video files since this video does not have HLS playlist'
       })
     }
 
@@ -34,7 +34,7 @@ const videoFilesDeleteWebTorrentValidator = [
   }
 ]
 
-const videoFilesDeleteWebTorrentFileValidator = [
+const videoFilesDeleteWebVideoFileValidator = [
   isValidVideoIdParam('id'),
 
   param('videoFileId')
@@ -52,14 +52,14 @@ const videoFilesDeleteWebTorrentFileValidator = [
     if (!files.find(f => f.id === +req.params.videoFileId)) {
       return res.fail({
         status: HttpStatusCode.NOT_FOUND_404,
-        message: 'This video does not have this WebTorrent file id'
+        message: 'This video does not have this Web Video file id'
       })
     }
 
     if (files.length === 1 && !video.getHLSPlaylist()) {
       return res.fail({
         status: HttpStatusCode.BAD_REQUEST_400,
-        message: 'Cannot delete WebTorrent files since this video does not have HLS playlist'
+        message: 'Cannot delete Web Video files since this video does not have HLS playlist'
       })
     }
 
@@ -87,10 +87,10 @@ const videoFilesDeleteHLSValidator = [
       })
     }
 
-    if (!video.hasWebTorrentFiles()) {
+    if (!video.hasWebVideoFiles()) {
       return res.fail({
         status: HttpStatusCode.BAD_REQUEST_400,
-        message: 'Cannot delete HLS playlist since this video does not have WebTorrent files'
+        message: 'Cannot delete HLS playlist since this video does not have Web Video files'
       })
     }
 
@@ -128,10 +128,10 @@ const videoFilesDeleteHLSFileValidator = [
     }
 
     // Last file to delete
-    if (hlsFiles.length === 1 && !video.hasWebTorrentFiles()) {
+    if (hlsFiles.length === 1 && !video.hasWebVideoFiles()) {
       return res.fail({
         status: HttpStatusCode.BAD_REQUEST_400,
-        message: 'Cannot delete last HLS playlist file since this video does not have WebTorrent files'
+        message: 'Cannot delete last HLS playlist file since this video does not have Web Video files'
       })
     }
 
@@ -140,8 +140,8 @@ const videoFilesDeleteHLSFileValidator = [
 ]
 
 export {
-  videoFilesDeleteWebTorrentValidator,
-  videoFilesDeleteWebTorrentFileValidator,
+  videoFilesDeleteWebVideoValidator,
+  videoFilesDeleteWebVideoFileValidator,
 
   videoFilesDeleteHLSValidator,
   videoFilesDeleteHLSFileValidator
diff --git a/server/middlewares/validators/videos/videos.ts b/server/middlewares/validators/videos/videos.ts
index b829e4eb4..b39d13a23 100644
--- a/server/middlewares/validators/videos/videos.ts
+++ b/server/middlewares/validators/videos/videos.ts
@@ -506,10 +506,14 @@ const commonVideosFiltersValidator = [
     .optional()
     .customSanitizer(toBooleanOrNull)
     .custom(isBooleanValid).withMessage('Should have a valid hasHLSFiles boolean'),
-  query('hasWebtorrentFiles')
+  query('hasWebtorrentFiles') // TODO: remove in v7
     .optional()
     .customSanitizer(toBooleanOrNull)
     .custom(isBooleanValid).withMessage('Should have a valid hasWebtorrentFiles boolean'),
+  query('hasWebVideoFiles')
+    .optional()
+    .customSanitizer(toBooleanOrNull)
+    .custom(isBooleanValid).withMessage('Should have a valid hasWebVideoFiles boolean'),
   query('skipCount')
     .optional()
     .customSanitizer(toBooleanOrNull)