X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fredundancy.ts;h=c379aebe491f9b376f1e7d0f3bcee4521037d731;hb=1f256e7d3cf056c2d999260155cdba58ae1b878b;hp=8cd3bc33d22823735b236f5fe3fad0420b507d95;hpb=a3b7421abb4192e215aa280418b62e96958c5e42;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/redundancy.ts b/server/middlewares/validators/redundancy.ts
index 8cd3bc33d..c379aebe4 100644
--- a/server/middlewares/validators/redundancy.ts
+++ b/server/middlewares/validators/redundancy.ts
@@ -8,6 +8,7 @@ import { isHostValid } from '../../helpers/custom-validators/servers'
 import { ServerModel } from '../../models/server/server'
 import { doesVideoExist } from '../../helpers/middlewares'
 import { isVideoRedundancyTarget } from '@server/helpers/custom-validators/video-redundancies'
+import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 
 const videoFileRedundancyGetValidator = [
   param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid video id'),
@@ -34,11 +35,11 @@ const videoFileRedundancyGetValidator = [
       return f.resolution === paramResolution && (!req.params.fps || paramFPS)
     })
 
-    if (!videoFile) return res.status(404).json({ error: 'Video file not found.' })
+    if (!videoFile) return res.status(HttpStatusCode.NOT_FOUND_404).json({ error: 'Video file not found.' })
     res.locals.videoFile = videoFile
 
     const videoRedundancy = await VideoRedundancyModel.loadLocalByFileId(videoFile.id)
-    if (!videoRedundancy) return res.status(404).json({ error: 'Video redundancy not found.' })
+    if (!videoRedundancy) return res.status(HttpStatusCode.NOT_FOUND_404).json({ error: 'Video redundancy not found.' })
     res.locals.videoRedundancy = videoRedundancy
 
     return next()
@@ -64,11 +65,11 @@ const videoPlaylistRedundancyGetValidator = [
     const paramPlaylistType = req.params.streamingPlaylistType as unknown as number // We casted to int above
     const videoStreamingPlaylist = video.VideoStreamingPlaylists.find(p => p.type === paramPlaylistType)
 
-    if (!videoStreamingPlaylist) return res.status(404).json({ error: 'Video playlist not found.' })
+    if (!videoStreamingPlaylist) return res.status(HttpStatusCode.NOT_FOUND_404).json({ error: 'Video playlist not found.' })
     res.locals.videoStreamingPlaylist = videoStreamingPlaylist
 
     const videoRedundancy = await VideoRedundancyModel.loadLocalByStreamingPlaylistId(videoStreamingPlaylist.id)
-    if (!videoRedundancy) return res.status(404).json({ error: 'Video redundancy not found.' })
+    if (!videoRedundancy) return res.status(HttpStatusCode.NOT_FOUND_404).json({ error: 'Video redundancy not found.' })
     res.locals.videoRedundancy = videoRedundancy
 
     return next()
@@ -90,7 +91,7 @@ const updateServerRedundancyValidator = [
 
     if (!server) {
       return res
-        .status(404)
+        .status(HttpStatusCode.NOT_FOUND_404)
         .json({
           error: `Server ${req.params.host} not found.`
         })
@@ -128,15 +129,19 @@ const addVideoRedundancyValidator = [
     if (!await doesVideoExist(req.body.videoId, res, 'only-video')) return
 
     if (res.locals.onlyVideo.remote === false) {
-      return res.status(400)
+      return res.status(HttpStatusCode.BAD_REQUEST_400)
         .json({ error: 'Cannot create a redundancy on a local video' })
-        .end()
+    }
+
+    if (res.locals.onlyVideo.isLive) {
+      return res.status(HttpStatusCode.BAD_REQUEST_400)
+        .json({ error: 'Cannot create a redundancy of a live video' })
     }
 
     const alreadyExists = await VideoRedundancyModel.isLocalByVideoUUIDExists(res.locals.onlyVideo.uuid)
     if (alreadyExists) {
-      return res.status(409)
-        .json({ error: 'This video is already duplicated by your instance.' })
+      return res.status(HttpStatusCode.CONFLICT_409)
+                .json({ error: 'This video is already duplicated by your instance.' })
     }
 
     return next()
@@ -155,7 +160,7 @@ const removeVideoRedundancyValidator = [
 
     const redundancy = await VideoRedundancyModel.loadByIdWithVideo(parseInt(req.params.redundancyId, 10))
     if (!redundancy) {
-      return res.status(404)
+      return res.status(HttpStatusCode.NOT_FOUND_404)
                 .json({ error: 'Video redundancy not found' })
                 .end()
     }