From 5a61ffbb7c72dd7ecfa16c7944dac45411c1bbe9 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 12 Jun 2020 16:01:42 +0200 Subject: Optimize views per day in video channels --- server/middlewares/validators/videos/video-channels.ts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'server/middlewares') diff --git a/server/middlewares/validators/videos/video-channels.ts b/server/middlewares/validators/videos/video-channels.ts index 882fb2b84..6604ae6a8 100644 --- a/server/middlewares/validators/videos/video-channels.ts +++ b/server/middlewares/validators/videos/video-channels.ts @@ -1,20 +1,20 @@ import * as express from 'express' import { body, param, query } from 'express-validator' +import { VIDEO_CHANNELS } from '@server/initializers/constants' +import { MChannelAccountDefault, MUser } from '@server/typings/models' import { UserRight } from '../../../../shared' +import { isActorPreferredUsernameValid } from '../../../helpers/custom-validators/activitypub/actor' +import { isBooleanValid, toBooleanOrNull } from '../../../helpers/custom-validators/misc' import { isVideoChannelDescriptionValid, isVideoChannelNameValid, isVideoChannelSupportValid } from '../../../helpers/custom-validators/video-channels' import { logger } from '../../../helpers/logger' +import { doesLocalVideoChannelNameExist, doesVideoChannelNameWithHostExist } from '../../../helpers/middlewares' +import { ActorModel } from '../../../models/activitypub/actor' import { VideoChannelModel } from '../../../models/video/video-channel' import { areValidationErrors } from '../utils' -import { isActorPreferredUsernameValid } from '../../../helpers/custom-validators/activitypub/actor' -import { ActorModel } from '../../../models/activitypub/actor' -import { isBooleanValid } from '../../../helpers/custom-validators/misc' -import { doesLocalVideoChannelNameExist, doesVideoChannelNameWithHostExist } from '../../../helpers/middlewares' -import { MChannelAccountDefault, MUser } from '@server/typings/models' -import { VIDEO_CHANNELS } from '@server/initializers/constants' const videoChannelsAddValidator = [ body('name').custom(isActorPreferredUsernameValid).withMessage('Should have a valid channel name'), @@ -129,7 +129,10 @@ const localVideoChannelValidator = [ ] const videoChannelStatsValidator = [ - query('withStats').optional().isBoolean().withMessage('Should have a valid stats flag'), + query('withStats') + .optional() + .customSanitizer(toBooleanOrNull) + .custom(isBooleanValid).withMessage('Should have a valid stats flag'), (req: express.Request, res: express.Response, next: express.NextFunction) => { if (areValidationErrors(req, res)) return -- cgit v1.2.3