Merge branch 'feature/correctly-send-activities' into develop

[oweals/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 a093e3e1b8eaac1d2bfc7675c22f02cd22e922a4..76647fea2be8264c424d887dd6252afc2ebda3ba 100644 (file)
--- a/server/helpers/custom-validators/misc.ts
+++ b/server/helpers/custom-validators/misc.ts
@@ -9,8 +9,12 @@ function isArray (value: any) {
   return Array.isArray(value)
 }
 
-function isIntArray (value: any) {
-  return Array.isArray(value) && value.every(v => validator.isInt('' + v))
+function isNotEmptyIntArray (value: any) {
+  return Array.isArray(value) && value.every(v => validator.isInt('' + v)) && value.length !== 0
+}
+
+function isArrayOf (value: any, validator: (value: any) => boolean) {
+  return isArray(value) && value.every(v => validator(v))
 }
 
 function isDateValid (value: string) {
@@ -82,7 +86,8 @@ function isFileValid (
 
 export {
   exists,
-  isIntArray,
+  isArrayOf,
+  isNotEmptyIntArray,
   isArray,
   isIdValid,
   isUUIDValid,