Merge branch 'release/v1.2.0'

[github/Chocobozzz/PeerTube.git] / server / helpers / custom-validators / misc.ts

diff --git a/server/helpers/custom-validators/misc.ts b/server/helpers/custom-validators/misc.ts
index 151fc852bae5d24c6ab99db14482a728859c9576..b6f0ebe6f2478fd06138978efefa9f95995cd4ef 100644 (file)
--- a/server/helpers/custom-validators/misc.ts
+++ b/server/helpers/custom-validators/misc.ts
@@ -9,6 +9,10 @@ function isArray (value: any) {
   return Array.isArray(value)
 }
 
+function isNotEmptyIntArray (value: any) {
+  return Array.isArray(value) && value.every(v => validator.isInt('' + v)) && value.length !== 0
+}
+
 function isDateValid (value: string) {
   return exists(value) && validator.isISO8601(value)
 }
@@ -51,7 +55,7 @@ function isFileValid (
   files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[],
   mimeTypeRegex: string,
   field: string,
-  maxSize: number,
+  maxSize: number | null,
   optional = false
 ) {
   // Should have files
@@ -69,7 +73,7 @@ function isFileValid (
   if (!file || !file.originalname) return false
 
   // Check size
-  if (maxSize && file.size > maxSize) return false
+  if ((maxSize !== null) && file.size > maxSize) return false
 
   return new RegExp(`^${mimeTypeRegex}$`, 'i').test(file.mimetype)
 }
@@ -78,6 +82,7 @@ function isFileValid (
 
 export {
   exists,
+  isNotEmptyIntArray,
   isArray,
   isIdValid,
   isUUIDValid,