Fix express validator

server/helpers/custom-validators/accounts.ts

@@ -1,4 +1,3 @@
-import 'express-validator'
 import { isUserDescriptionValid, isUserUsernameValid } from './users'
 import { exists } from './misc'
 

server/helpers/custom-validators/misc.ts

@@ -1,6 +1,7 @@
 import 'multer'
 import * as validator from 'validator'
 import { sep } from 'path'
+import toBoolean = require('validator/lib/toBoolean')
 
 function exists (value: any) {
   return value !== undefined && value !== null
@@ -46,9 +47,21 @@ function isBooleanValid (value: any) {
 }
 
 function toIntOrNull (value: string) {
-  if (value === 'null') return null
+  const v = toValueOrNull(value)
 
-  return validator.toInt(value)
+  if (v === null || v === undefined) return v
+  if (typeof v === 'number') return v
+
+  return validator.toInt(v)
+}
+
+function toBooleanOrNull (value: any) {
+  const v = toValueOrNull(value)
+
+  if (v === null || v === undefined) return v
+  if (typeof v === 'boolean') return v
+
+  return toBoolean(v)
 }
 
 function toValueOrNull (value: string) {
@@ -110,6 +123,7 @@ export {
   isIdOrUUIDValid,
   isDateValid,
   toValueOrNull,
+  toBooleanOrNull,
   isBooleanValid,
   toIntOrNull,
   toArray,

server/helpers/custom-validators/search.ts

@@ -1,6 +1,4 @@
 import * as validator from 'validator'
-import 'express-validator'
-
 import { isArray } from './misc'
 
 function isNumberArray (value: any) {

server/helpers/custom-validators/servers.ts

@@ -1,7 +1,5 @@
 import * as validator from 'validator'
-import 'express-validator'
-
-import { isArray, exists } from './misc'
+import { exists, isArray } from './misc'
 import { isTestInstance } from '../core-utils'
 import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
 

server/helpers/custom-validators/users.ts

@@ -1,4 +1,3 @@
-import 'express-validator'
 import * as validator from 'validator'
 import { UserRole } from '../../../shared'
 import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers/constants'

server/helpers/custom-validators/video-channels.ts

@@ -1,5 +1,3 @@
-import 'express-validator'
-import 'multer'
 import * as validator from 'validator'
 import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
 import { exists } from './misc'

server/helpers/custom-validators/video-comments.ts

@@ -1,4 +1,3 @@
-import 'express-validator'
 import 'multer'
 import * as validator from 'validator'
 import { CONSTRAINTS_FIELDS } from '../../initializers/constants'

server/helpers/custom-validators/video-imports.ts

@@ -1,4 +1,3 @@
-import 'express-validator'
 import 'multer'
 import * as validator from 'validator'
 import { CONSTRAINTS_FIELDS, MIMETYPES, VIDEO_IMPORT_STATES } from '../../initializers/constants'

server/helpers/custom-validators/videos.ts

@@ -1,9 +1,6 @@
-import { Response } from 'express'
-import 'express-validator'
 import { values } from 'lodash'
-import 'multer'
 import * as validator from 'validator'
-import { UserRight, VideoFilter, VideoPrivacy, VideoRateType } from '../../../shared'
+import { VideoFilter, VideoPrivacy, VideoRateType } from '../../../shared'
 import {
   CONSTRAINTS_FIELDS,
   MIMETYPES,
@@ -13,9 +10,7 @@ import {
   VIDEO_RATE_TYPES,
   VIDEO_STATES
 } from '../../initializers/constants'
-import { VideoModel } from '../../models/video/video'
 import { exists, isArray, isDateValid, isFileValid } from './misc'
-import { UserModel } from '../../models/account/user'
 import * as magnetUtil from 'magnet-uri'
 
 const VIDEOS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEOS