-import * as express from 'express'
+import express from 'express'
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, toBooleanOrNull } from '../../helpers/custom-validators/misc'
+import { isUserNotificationSettingValid } from '../../helpers/custom-validators/user-notifications'
+import { areValidationErrors } from './shared'
const listUserNotificationsValidator = [
query('unread')
.isBoolean().withMessage('Should have a valid unread boolean'),
(req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking listUserNotificationsValidator parameters', { parameters: req.query })
-
if (areValidationErrors(req, res)) return
return next()
const updateNotificationSettingsValidator = [
body('newVideoFromSubscription')
- .custom(isUserNotificationSettingValid).withMessage('Should have a valid new video from subscription notification setting'),
+ .custom(isUserNotificationSettingValid),
body('newCommentOnMyVideo')
- .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'),
+ .custom(isUserNotificationSettingValid),
+ body('abuseAsModerator')
+ .custom(isUserNotificationSettingValid),
body('videoAutoBlacklistAsModerator')
- .custom(isUserNotificationSettingValid).withMessage('Should have a valid video auto blacklist notification setting'),
+ .custom(isUserNotificationSettingValid),
body('blacklistOnMyVideo')
- .custom(isUserNotificationSettingValid).withMessage('Should have a valid new blacklist on my video notification setting'),
+ .custom(isUserNotificationSettingValid),
body('myVideoImportFinished')
- .custom(isUserNotificationSettingValid).withMessage('Should have a valid video import finished video notification setting'),
+ .custom(isUserNotificationSettingValid),
body('myVideoPublished')
- .custom(isUserNotificationSettingValid).withMessage('Should have a valid video published notification setting'),
+ .custom(isUserNotificationSettingValid),
body('commentMention')
- .custom(isUserNotificationSettingValid).withMessage('Should have a valid comment mention notification setting'),
+ .custom(isUserNotificationSettingValid),
body('newFollow')
- .custom(isUserNotificationSettingValid).withMessage('Should have a valid new follow notification setting'),
+ .custom(isUserNotificationSettingValid),
body('newUserRegistration')
- .custom(isUserNotificationSettingValid).withMessage('Should have a valid new user registration notification setting'),
+ .custom(isUserNotificationSettingValid),
body('newInstanceFollower')
- .custom(isUserNotificationSettingValid).withMessage('Should have a valid new instance follower notification setting'),
+ .custom(isUserNotificationSettingValid),
body('autoInstanceFollowing')
- .custom(isUserNotificationSettingValid).withMessage('Should have a valid new instance following notification setting'),
+ .custom(isUserNotificationSettingValid),
(req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking updateNotificationSettingsValidator parameters', { parameters: req.body })
-
if (areValidationErrors(req, res)) return
return next()
const markAsReadUserNotificationsValidator = [
body('ids')
.optional()
- .custom(isNotEmptyIntArray).withMessage('Should have a valid notification ids to mark as read'),
+ .custom(isNotEmptyIntArray).withMessage('Should have a valid array of notification ids'),
(req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking markAsReadUserNotificationsValidator parameters', { parameters: req.body })
-
if (areValidationErrors(req, res)) return
return next()