From 0f6acda11681de90d38dd18669863c6e270851ee Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 19 Mar 2019 09:26:50 +0100 Subject: Does exist --- server/middlewares/validators/videos/video-blacklist.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'server/middlewares/validators/videos/video-blacklist.ts') diff --git a/server/middlewares/validators/videos/video-blacklist.ts b/server/middlewares/validators/videos/video-blacklist.ts index 2688f63ae..77ad29cbb 100644 --- a/server/middlewares/validators/videos/video-blacklist.ts +++ b/server/middlewares/validators/videos/video-blacklist.ts @@ -1,10 +1,10 @@ import * as express from 'express' import { body, param } from 'express-validator/check' import { isBooleanValid, isIdOrUUIDValid } from '../../../helpers/custom-validators/misc' -import { isVideoExist } from '../../../helpers/custom-validators/videos' +import { doesVideoExist } from '../../../helpers/custom-validators/videos' import { logger } from '../../../helpers/logger' import { areValidationErrors } from '../utils' -import { isVideoBlacklistExist, isVideoBlacklistReasonValid } from '../../../helpers/custom-validators/video-blacklist' +import { doesVideoBlacklistExist, isVideoBlacklistReasonValid } from '../../../helpers/custom-validators/video-blacklist' import { VideoModel } from '../../../models/video/video' const videosBlacklistRemoveValidator = [ @@ -14,8 +14,8 @@ const videosBlacklistRemoveValidator = [ logger.debug('Checking blacklistRemove parameters.', { parameters: req.params }) if (areValidationErrors(req, res)) return - if (!await isVideoExist(req.params.videoId, res)) return - if (!await isVideoBlacklistExist(res.locals.video.id, res)) return + if (!await doesVideoExist(req.params.videoId, res)) return + if (!await doesVideoBlacklistExist(res.locals.video.id, res)) return return next() } @@ -35,7 +35,7 @@ const videosBlacklistAddValidator = [ logger.debug('Checking videosBlacklistAdd parameters', { parameters: req.params }) if (areValidationErrors(req, res)) return - if (!await isVideoExist(req.params.videoId, res)) return + if (!await doesVideoExist(req.params.videoId, res)) return const video: VideoModel = res.locals.video if (req.body.unfederate === true && video.remote === true) { @@ -59,8 +59,8 @@ const videosBlacklistUpdateValidator = [ logger.debug('Checking videosBlacklistUpdate parameters', { parameters: req.params }) if (areValidationErrors(req, res)) return - if (!await isVideoExist(req.params.videoId, res)) return - if (!await isVideoBlacklistExist(res.locals.video.id, res)) return + if (!await doesVideoExist(req.params.videoId, res)) return + if (!await doesVideoBlacklistExist(res.locals.video.id, res)) return return next() } -- cgit v1.2.3