Correctly close RTMPS server too

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / user-notifications.ts

diff --git a/server/middlewares/validators/user-notifications.ts b/server/middlewares/validators/user-notifications.ts
index fbfcb0a4ca0a0399d3235f74d7fc7ab2865a44b7..4a7577d32ec6ad5bd25a103b22b3112be26fa779 100644 (file)
--- a/server/middlewares/validators/user-notifications.ts
+++ b/server/middlewares/validators/user-notifications.ts
@@ -1,9 +1,9 @@
-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 { logger } from '../../helpers/logger'
+import { areValidationErrors } from './shared'
 
 const listUserNotificationsValidator = [
   query('unread')
@@ -25,8 +25,8 @@ const updateNotificationSettingsValidator = [
     .custom(isUserNotificationSettingValid).withMessage('Should have a valid new video from subscription notification setting'),
   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'),
+  body('abuseAsModerator')
+    .custom(isUserNotificationSettingValid).withMessage('Should have a valid abuse as moderator notification setting'),
   body('videoAutoBlacklistAsModerator')
     .custom(isUserNotificationSettingValid).withMessage('Should have a valid video auto blacklist notification setting'),
   body('blacklistOnMyVideo')