diff options
Diffstat (limited to 'server/middlewares/validators/videos/videos.ts')
-rw-r--r-- | server/middlewares/validators/videos/videos.ts | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/server/middlewares/validators/videos/videos.ts b/server/middlewares/validators/videos/videos.ts index a5e3ed0dc..92218d4b1 100644 --- a/server/middlewares/validators/videos/videos.ts +++ b/server/middlewares/validators/videos/videos.ts | |||
@@ -17,9 +17,9 @@ import { | |||
17 | isVideoOriginallyPublishedAtValid, | 17 | isVideoOriginallyPublishedAtValid, |
18 | isScheduleVideoUpdatePrivacyValid, | 18 | isScheduleVideoUpdatePrivacyValid, |
19 | isVideoCategoryValid, | 19 | isVideoCategoryValid, |
20 | isVideoChannelOfAccountExist, | 20 | doesVideoChannelOfAccountExist, |
21 | isVideoDescriptionValid, | 21 | isVideoDescriptionValid, |
22 | isVideoExist, | 22 | doesVideoExist, |
23 | isVideoFile, | 23 | isVideoFile, |
24 | isVideoFilterValid, | 24 | isVideoFilterValid, |
25 | isVideoImage, | 25 | isVideoImage, |
@@ -66,7 +66,7 @@ const videosAddValidator = getCommonVideoEditAttributes().concat([ | |||
66 | const videoFile: Express.Multer.File = req.files['videofile'][0] | 66 | const videoFile: Express.Multer.File = req.files['videofile'][0] |
67 | const user = res.locals.oauth.token.User | 67 | const user = res.locals.oauth.token.User |
68 | 68 | ||
69 | if (!await isVideoChannelOfAccountExist(req.body.channelId, user, res)) return cleanUpReqFiles(req) | 69 | if (!await doesVideoChannelOfAccountExist(req.body.channelId, user, res)) return cleanUpReqFiles(req) |
70 | 70 | ||
71 | const isAble = await user.isAbleToUploadVideo(videoFile) | 71 | const isAble = await user.isAbleToUploadVideo(videoFile) |
72 | if (isAble === false) { | 72 | if (isAble === false) { |
@@ -109,7 +109,7 @@ const videosUpdateValidator = getCommonVideoEditAttributes().concat([ | |||
109 | 109 | ||
110 | if (areValidationErrors(req, res)) return cleanUpReqFiles(req) | 110 | if (areValidationErrors(req, res)) return cleanUpReqFiles(req) |
111 | if (areErrorsInScheduleUpdate(req, res)) return cleanUpReqFiles(req) | 111 | if (areErrorsInScheduleUpdate(req, res)) return cleanUpReqFiles(req) |
112 | if (!await isVideoExist(req.params.id, res)) return cleanUpReqFiles(req) | 112 | if (!await doesVideoExist(req.params.id, res)) return cleanUpReqFiles(req) |
113 | 113 | ||
114 | const video = res.locals.video | 114 | const video = res.locals.video |
115 | 115 | ||
@@ -123,7 +123,7 @@ const videosUpdateValidator = getCommonVideoEditAttributes().concat([ | |||
123 | .json({ error: 'Cannot set "private" a video that was not private.' }) | 123 | .json({ error: 'Cannot set "private" a video that was not private.' }) |
124 | } | 124 | } |
125 | 125 | ||
126 | if (req.body.channelId && !await isVideoChannelOfAccountExist(req.body.channelId, user, res)) return cleanUpReqFiles(req) | 126 | if (req.body.channelId && !await doesVideoChannelOfAccountExist(req.body.channelId, user, res)) return cleanUpReqFiles(req) |
127 | 127 | ||
128 | return next() | 128 | return next() |
129 | } | 129 | } |
@@ -162,7 +162,7 @@ const videosCustomGetValidator = (fetchType: VideoFetchType) => { | |||
162 | logger.debug('Checking videosGet parameters', { parameters: req.params }) | 162 | logger.debug('Checking videosGet parameters', { parameters: req.params }) |
163 | 163 | ||
164 | if (areValidationErrors(req, res)) return | 164 | if (areValidationErrors(req, res)) return |
165 | if (!await isVideoExist(req.params.id, res, fetchType)) return | 165 | if (!await doesVideoExist(req.params.id, res, fetchType)) return |
166 | 166 | ||
167 | const video: VideoModel = res.locals.video | 167 | const video: VideoModel = res.locals.video |
168 | 168 | ||
@@ -207,7 +207,7 @@ const videosRemoveValidator = [ | |||
207 | logger.debug('Checking videosRemove parameters', { parameters: req.params }) | 207 | logger.debug('Checking videosRemove parameters', { parameters: req.params }) |
208 | 208 | ||
209 | if (areValidationErrors(req, res)) return | 209 | if (areValidationErrors(req, res)) return |
210 | if (!await isVideoExist(req.params.id, res)) return | 210 | if (!await doesVideoExist(req.params.id, res)) return |
211 | 211 | ||
212 | // Check if the user who did the request is able to delete the video | 212 | // Check if the user who did the request is able to delete the video |
213 | if (!checkUserCanManageVideo(res.locals.oauth.token.User, res.locals.video, UserRight.REMOVE_ANY_VIDEO, res)) return | 213 | if (!checkUserCanManageVideo(res.locals.oauth.token.User, res.locals.video, UserRight.REMOVE_ANY_VIDEO, res)) return |
@@ -223,7 +223,7 @@ const videosChangeOwnershipValidator = [ | |||
223 | logger.debug('Checking changeOwnership parameters', { parameters: req.params }) | 223 | logger.debug('Checking changeOwnership parameters', { parameters: req.params }) |
224 | 224 | ||
225 | if (areValidationErrors(req, res)) return | 225 | if (areValidationErrors(req, res)) return |
226 | if (!await isVideoExist(req.params.videoId, res)) return | 226 | if (!await doesVideoExist(req.params.videoId, res)) return |
227 | 227 | ||
228 | // Check if the user who did the request is able to change the ownership of the video | 228 | // Check if the user who did the request is able to change the ownership of the video |
229 | if (!checkUserCanManageVideo(res.locals.oauth.token.User, res.locals.video, UserRight.CHANGE_VIDEO_OWNERSHIP, res)) return | 229 | if (!checkUserCanManageVideo(res.locals.oauth.token.User, res.locals.video, UserRight.CHANGE_VIDEO_OWNERSHIP, res)) return |
@@ -272,7 +272,7 @@ const videosTerminateChangeOwnershipValidator = [ | |||
272 | const videosAcceptChangeOwnershipValidator = [ | 272 | const videosAcceptChangeOwnershipValidator = [ |
273 | async (req: express.Request, res: express.Response, next: express.NextFunction) => { | 273 | async (req: express.Request, res: express.Response, next: express.NextFunction) => { |
274 | const body = req.body as VideoChangeOwnershipAccept | 274 | const body = req.body as VideoChangeOwnershipAccept |
275 | if (!await isVideoChannelOfAccountExist(body.channelId, res.locals.oauth.token.User, res)) return | 275 | if (!await doesVideoChannelOfAccountExist(body.channelId, res.locals.oauth.token.User, res)) return |
276 | 276 | ||
277 | const user = res.locals.oauth.token.User | 277 | const user = res.locals.oauth.token.User |
278 | const videoChangeOwnership = res.locals.videoChangeOwnership as VideoChangeOwnershipModel | 278 | const videoChangeOwnership = res.locals.videoChangeOwnership as VideoChangeOwnershipModel |