Fix updating video tags to empty field

2 files changed, 7 insertions, 5 deletions

diff --git a/server/helpers/custom-validators/misc.ts b/server/helpers/custom-validators/misc.ts
index 275482fa1..254b4db6c 100644
--- a/server/helpers/custom-validators/misc.ts
+++ b/server/helpers/custom-validators/misc.ts
@@ -35,7 +35,7 @@ function toIntOrNull (value: string) {
   return validator.toInt(value)
 }
 
-function toStringOrNull (value: string) {
+function toValueOrNull (value: string) {
   if (value === 'null') return null
 
   return value
@@ -73,7 +73,7 @@ export {
   isUUIDValid,
   isIdOrUUIDValid,
   isDateValid,
-  toStringOrNull,
+  toValueOrNull,
   isBooleanValid,
   toIntOrNull,
   isFileValid
diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts
index c35db49ac..002324fe0 100644
--- a/server/helpers/custom-validators/videos.ts
+++ b/server/helpers/custom-validators/videos.ts
@@ -57,9 +57,11 @@ function isVideoTagValid (tag: string) {
 }
 
 function isVideoTagsValid (tags: string[]) {
-  return isArray(tags) &&
-         validator.isInt(tags.length.toString(), VIDEOS_CONSTRAINTS_FIELDS.TAGS) &&
-         tags.every(tag => isVideoTagValid(tag))
+  return tags === null || (
+    isArray(tags) &&
+    validator.isInt(tags.length.toString(), VIDEOS_CONSTRAINTS_FIELDS.TAGS) &&
+    tags.every(tag => isVideoTagValid(tag))
+  )
 }
 
 function isVideoAbuseReasonValid (value: string) {