X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fuser-notifications.ts;h=fbfcb0a4ca0a0399d3235f74d7fc7ab2865a44b7;hb=8c559fad1e1c4c2ab7f1388c73200aa4c6256d74;hp=46486e081332a815edc0537ee6db4520d57fe09a;hpb=73471b1a52f242e86364ffb077ea6cadb3b07ae2;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/user-notifications.ts b/server/middlewares/validators/user-notifications.ts
index 46486e081..fbfcb0a4c 100644
--- a/server/middlewares/validators/user-notifications.ts
+++ b/server/middlewares/validators/user-notifications.ts
@@ -1,15 +1,14 @@
 import * as express from 'express'
-import 'express-validator'
-import { body, query } from 'express-validator/check'
+import { body, query } from 'express-validator'
 import { logger } from '../../helpers/logger'
 import { areValidationErrors } from './utils'
 import { isUserNotificationSettingValid } from '../../helpers/custom-validators/user-notifications'
-import { isNotEmptyIntArray } from '../../helpers/custom-validators/misc'
+import { isNotEmptyIntArray, toBooleanOrNull } from '../../helpers/custom-validators/misc'
 
 const listUserNotificationsValidator = [
   query('unread')
     .optional()
-    .toBoolean()
+    .customSanitizer(toBooleanOrNull)
     .isBoolean().withMessage('Should have a valid unread boolean'),
 
   (req: express.Request, res: express.Response, next: express.NextFunction) => {
@@ -28,8 +27,24 @@ const updateNotificationSettingsValidator = [
     .custom(isUserNotificationSettingValid).withMessage('Should have a valid new comment on my video notification setting'),
   body('videoAbuseAsModerator')
     .custom(isUserNotificationSettingValid).withMessage('Should have a valid new video abuse as moderator notification setting'),
+  body('videoAutoBlacklistAsModerator')
+    .custom(isUserNotificationSettingValid).withMessage('Should have a valid video auto blacklist notification setting'),
   body('blacklistOnMyVideo')
     .custom(isUserNotificationSettingValid).withMessage('Should have a valid new blacklist on my video notification setting'),
+  body('myVideoImportFinished')
+    .custom(isUserNotificationSettingValid).withMessage('Should have a valid video import finished video notification setting'),
+  body('myVideoPublished')
+    .custom(isUserNotificationSettingValid).withMessage('Should have a valid video published notification setting'),
+  body('commentMention')
+    .custom(isUserNotificationSettingValid).withMessage('Should have a valid comment mention notification setting'),
+  body('newFollow')
+    .custom(isUserNotificationSettingValid).withMessage('Should have a valid new follow notification setting'),
+  body('newUserRegistration')
+    .custom(isUserNotificationSettingValid).withMessage('Should have a valid new user registration notification setting'),
+  body('newInstanceFollower')
+    .custom(isUserNotificationSettingValid).withMessage('Should have a valid new instance follower notification setting'),
+  body('autoInstanceFollowing')
+    .custom(isUserNotificationSettingValid).withMessage('Should have a valid new instance following notification setting'),
 
   (req: express.Request, res: express.Response, next: express.NextFunction) => {
     logger.debug('Checking updateNotificationSettingsValidator parameters', { parameters: req.body })