aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/middlewares/validators/videos/video-comments.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-03-19 09:26:50 +0100
committerChocobozzz <me@florianbigard.com>2019-03-19 09:26:50 +0100
commit0f6acda11681de90d38dd18669863c6e270851ee (patch)
treeb3b28e00d539645f5a810202dc8afada289e7b2e /server/middlewares/validators/videos/video-comments.ts
parent9a18a6252071cf21b18f82a24bb63078abb75bc1 (diff)
downloadPeerTube-0f6acda11681de90d38dd18669863c6e270851ee.tar.gz
PeerTube-0f6acda11681de90d38dd18669863c6e270851ee.tar.zst
PeerTube-0f6acda11681de90d38dd18669863c6e270851ee.zip
Does exist
Diffstat (limited to 'server/middlewares/validators/videos/video-comments.ts')
-rw-r--r--server/middlewares/validators/videos/video-comments.ts26
1 files changed, 13 insertions, 13 deletions
diff --git a/server/middlewares/validators/videos/video-comments.ts b/server/middlewares/validators/videos/video-comments.ts
index 348d33082..ffde208b7 100644
--- a/server/middlewares/validators/videos/video-comments.ts
+++ b/server/middlewares/validators/videos/video-comments.ts
@@ -3,7 +3,7 @@ import { body, param } from 'express-validator/check'
3import { UserRight } from '../../../../shared' 3import { UserRight } from '../../../../shared'
4import { isIdOrUUIDValid, isIdValid } from '../../../helpers/custom-validators/misc' 4import { isIdOrUUIDValid, isIdValid } from '../../../helpers/custom-validators/misc'
5import { isValidVideoCommentText } from '../../../helpers/custom-validators/video-comments' 5import { isValidVideoCommentText } from '../../../helpers/custom-validators/video-comments'
6import { isVideoExist } from '../../../helpers/custom-validators/videos' 6import { doesVideoExist } from '../../../helpers/custom-validators/videos'
7import { logger } from '../../../helpers/logger' 7import { logger } from '../../../helpers/logger'
8import { UserModel } from '../../../models/account/user' 8import { UserModel } from '../../../models/account/user'
9import { VideoModel } from '../../../models/video/video' 9import { VideoModel } from '../../../models/video/video'
@@ -17,7 +17,7 @@ const listVideoCommentThreadsValidator = [
17 logger.debug('Checking listVideoCommentThreads parameters.', { parameters: req.params }) 17 logger.debug('Checking listVideoCommentThreads parameters.', { parameters: req.params })
18 18
19 if (areValidationErrors(req, res)) return 19 if (areValidationErrors(req, res)) return
20 if (!await isVideoExist(req.params.videoId, res, 'only-video')) return 20 if (!await doesVideoExist(req.params.videoId, res, 'only-video')) return
21 21
22 return next() 22 return next()
23 } 23 }
@@ -31,8 +31,8 @@ const listVideoThreadCommentsValidator = [
31 logger.debug('Checking listVideoThreadComments parameters.', { parameters: req.params }) 31 logger.debug('Checking listVideoThreadComments parameters.', { parameters: req.params })
32 32
33 if (areValidationErrors(req, res)) return 33 if (areValidationErrors(req, res)) return
34 if (!await isVideoExist(req.params.videoId, res, 'only-video')) return 34 if (!await doesVideoExist(req.params.videoId, res, 'only-video')) return
35 if (!await isVideoCommentThreadExist(req.params.threadId, res.locals.video, res)) return 35 if (!await doesVideoCommentThreadExist(req.params.threadId, res.locals.video, res)) return
36 36
37 return next() 37 return next()
38 } 38 }
@@ -46,7 +46,7 @@ const addVideoCommentThreadValidator = [
46 logger.debug('Checking addVideoCommentThread parameters.', { parameters: req.params, body: req.body }) 46 logger.debug('Checking addVideoCommentThread parameters.', { parameters: req.params, body: req.body })
47 47
48 if (areValidationErrors(req, res)) return 48 if (areValidationErrors(req, res)) return
49 if (!await isVideoExist(req.params.videoId, res)) return 49 if (!await doesVideoExist(req.params.videoId, res)) return
50 if (!isVideoCommentsEnabled(res.locals.video, res)) return 50 if (!isVideoCommentsEnabled(res.locals.video, res)) return
51 51
52 return next() 52 return next()
@@ -62,9 +62,9 @@ const addVideoCommentReplyValidator = [
62 logger.debug('Checking addVideoCommentReply parameters.', { parameters: req.params, body: req.body }) 62 logger.debug('Checking addVideoCommentReply parameters.', { parameters: req.params, body: req.body })
63 63
64 if (areValidationErrors(req, res)) return 64 if (areValidationErrors(req, res)) return
65 if (!await isVideoExist(req.params.videoId, res)) return 65 if (!await doesVideoExist(req.params.videoId, res)) return
66 if (!isVideoCommentsEnabled(res.locals.video, res)) return 66 if (!isVideoCommentsEnabled(res.locals.video, res)) return
67 if (!await isVideoCommentExist(req.params.commentId, res.locals.video, res)) return 67 if (!await doesVideoCommentExist(req.params.commentId, res.locals.video, res)) return
68 68
69 return next() 69 return next()
70 } 70 }
@@ -78,8 +78,8 @@ const videoCommentGetValidator = [
78 logger.debug('Checking videoCommentGetValidator parameters.', { parameters: req.params }) 78 logger.debug('Checking videoCommentGetValidator parameters.', { parameters: req.params })
79 79
80 if (areValidationErrors(req, res)) return 80 if (areValidationErrors(req, res)) return
81 if (!await isVideoExist(req.params.videoId, res, 'id')) return 81 if (!await doesVideoExist(req.params.videoId, res, 'id')) return
82 if (!await isVideoCommentExist(req.params.commentId, res.locals.video, res)) return 82 if (!await doesVideoCommentExist(req.params.commentId, res.locals.video, res)) return
83 83
84 return next() 84 return next()
85 } 85 }
@@ -93,8 +93,8 @@ const removeVideoCommentValidator = [
93 logger.debug('Checking removeVideoCommentValidator parameters.', { parameters: req.params }) 93 logger.debug('Checking removeVideoCommentValidator parameters.', { parameters: req.params })
94 94
95 if (areValidationErrors(req, res)) return 95 if (areValidationErrors(req, res)) return
96 if (!await isVideoExist(req.params.videoId, res)) return 96 if (!await doesVideoExist(req.params.videoId, res)) return
97 if (!await isVideoCommentExist(req.params.commentId, res.locals.video, res)) return 97 if (!await doesVideoCommentExist(req.params.commentId, res.locals.video, res)) return
98 98
99 // Check if the user who did the request is able to delete the video 99 // Check if the user who did the request is able to delete the video
100 if (!checkUserCanDeleteVideoComment(res.locals.oauth.token.User, res.locals.videoComment, res)) return 100 if (!checkUserCanDeleteVideoComment(res.locals.oauth.token.User, res.locals.videoComment, res)) return
@@ -116,7 +116,7 @@ export {
116 116
117// --------------------------------------------------------------------------- 117// ---------------------------------------------------------------------------
118 118
119async function isVideoCommentThreadExist (id: number, video: VideoModel, res: express.Response) { 119async function doesVideoCommentThreadExist (id: number, video: VideoModel, res: express.Response) {
120 const videoComment = await VideoCommentModel.loadById(id) 120 const videoComment = await VideoCommentModel.loadById(id)
121 121
122 if (!videoComment) { 122 if (!videoComment) {
@@ -147,7 +147,7 @@ async function isVideoCommentThreadExist (id: number, video: VideoModel, res: ex
147 return true 147 return true
148} 148}
149 149
150async function isVideoCommentExist (id: number, video: VideoModel, res: express.Response) { 150async function doesVideoCommentExist (id: number, video: VideoModel, res: express.Response) {
151 const videoComment = await VideoCommentModel.loadByIdAndPopulateVideoAndAccountAndReply(id) 151 const videoComment = await VideoCommentModel.loadByIdAndPopulateVideoAndAccountAndReply(id)
152 152
153 if (!videoComment) { 153 if (!videoComment) {