Merge branch 'develop' into shorter-URLs-channels-accounts

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / videos / video-comments.ts

diff --git a/server/middlewares/validators/videos/video-comments.ts b/server/middlewares/validators/videos/video-comments.ts
index 55fb60b98e10cbcf3490003c54309e9041d81a5b..1afacfed878e508391749815cfc2237c0e43bf89 100644 (file)
--- a/server/middlewares/validators/videos/video-comments.ts
+++ b/server/middlewares/validators/videos/video-comments.ts
@@ -2,7 +2,7 @@ import * as express from 'express'
 import { body, param, query } from 'express-validator'
 import { MUserAccountUrl } from '@server/types/models'
 import { UserRight } from '../../../../shared'
-import { exists, isBooleanValid, isIdOrUUIDValid, isIdValid } from '../../../helpers/custom-validators/misc'
+import { exists, isBooleanValid, isIdOrUUIDValid, isIdValid, toBooleanOrNull } from '../../../helpers/custom-validators/misc'
 import {
   doesVideoCommentExist,
   doesVideoCommentThreadExist,
@@ -14,10 +14,12 @@ import { AcceptResult, isLocalVideoCommentReplyAccepted, isLocalVideoThreadAccep
 import { Hooks } from '../../../lib/plugins/hooks'
 import { MCommentOwnerVideoReply, MVideo, MVideoFullLight } from '../../../types/models/video'
 import { areValidationErrors } from '../utils'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 
 const listVideoCommentsValidator = [
   query('isLocal')
   .optional()
+  .customSanitizer(toBooleanOrNull)
   .custom(isBooleanValid)
   .withMessage('Should have a valid is local boolean'),
 
@@ -153,8 +155,8 @@ export {
 
 function isVideoCommentsEnabled (video: MVideo, res: express.Response) {
   if (video.commentsEnabled !== true) {
-    res.status(409)
-      .json({ error: 'Video comments are disabled for this video.' })
+    res.status(HttpStatusCode.CONFLICT_409)
+       .json({ error: 'Video comments are disabled for this video.' })
 
     return false
   }
@@ -164,8 +166,8 @@ function isVideoCommentsEnabled (video: MVideo, res: express.Response) {
 
 function checkUserCanDeleteVideoComment (user: MUserAccountUrl, videoComment: MCommentOwnerVideoReply, res: express.Response) {
   if (videoComment.isDeleted()) {
-    res.status(409)
-      .json({ error: 'This comment is already deleted' })
+    res.status(HttpStatusCode.CONFLICT_409)
+       .json({ error: 'This comment is already deleted' })
 
     return false
   }
@@ -177,7 +179,7 @@ function checkUserCanDeleteVideoComment (user: MUserAccountUrl, videoComment: MC
     videoComment.accountId !== userAccount.id && // Not the comment owner
     videoComment.Video.VideoChannel.accountId !== userAccount.id // Not the video owner
   ) {
-    res.status(403)
+    res.status(HttpStatusCode.FORBIDDEN_403)
       .json({ error: 'Cannot remove video comment of another user' })
 
     return false
@@ -213,8 +215,8 @@ async function isVideoCommentAccepted (req: express.Request, res: express.Respon
 
   if (!acceptedResult || acceptedResult.accepted !== true) {
     logger.info('Refused local comment.', { acceptedResult, acceptParameters })
-    res.status(403)
-       .json({ error: acceptedResult.errorMessage || 'Refused local comment' })
+    res.status(HttpStatusCode.FORBIDDEN_403)
+       .json({ error: acceptedResult?.errorMessage || 'Refused local comment' })
 
     return false
   }