X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fform-validators%2Fvideo-validators.ts;h=ab6f21a350fe99e298165a96fb921d4042a7b4ba;hb=4158e67c8d7eb39712e598d3f409c6739eef5f0b;hp=23f2391b247a2960e7f08c4e1a9be9d4367c95fc;hpb=1e7eb457eda647b4fa22a0ae8e59c0a618f662f8;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/shared/form-validators/video-validators.ts b/client/src/app/shared/form-validators/video-validators.ts
index 23f2391b2..ab6f21a35 100644
--- a/client/src/app/shared/form-validators/video-validators.ts
+++ b/client/src/app/shared/form-validators/video-validators.ts
@@ -1,19 +1,28 @@
-import { AbstractControl, ValidationErrors, ValidatorFn, Validators } from '@angular/forms'
+import { AbstractControl, ValidationErrors, ValidatorFn, Validators, FormControl } from '@angular/forms'
 import { BuildFormValidator } from './form-validator.model'
 
+export const trimValidator: ValidatorFn = (control: FormControl) => {
+  if (control.value.startsWith(' ') || control.value.endsWith(' ')) {
+    return { spaces: true }
+  }
+
+  return null
+}
+
 export const VIDEO_NAME_VALIDATOR: BuildFormValidator = {
   VALIDATORS: [ Validators.required, Validators.minLength(3), Validators.maxLength(120) ],
   MESSAGES: {
-    'required': $localize`Video name is required.`,
-    'minlength': $localize`Video name must be at least 3 characters long.`,
-    'maxlength': $localize`Video name cannot be more than 120 characters long.`
+    required: $localize`Video name is required.`,
+    minlength: $localize`Video name must be at least 3 characters long.`,
+    maxlength: $localize`Video name cannot be more than 120 characters long.`,
+    spaces: $localize`Video name has leading or trailing whitespace.`
   }
 }
 
 export const VIDEO_PRIVACY_VALIDATOR: BuildFormValidator = {
   VALIDATORS: [ Validators.required ],
   MESSAGES: {
-    'required': $localize`Video privacy is required.`
+    required: $localize`Video privacy is required.`
   }
 }
 
@@ -40,46 +49,46 @@ export const VIDEO_IMAGE_VALIDATOR: BuildFormValidator = {
 export const VIDEO_CHANNEL_VALIDATOR: BuildFormValidator = {
   VALIDATORS: [ Validators.required ],
   MESSAGES: {
-    'required': $localize`Video channel is required.`
+    required: $localize`Video channel is required.`
   }
 }
 
 export const VIDEO_DESCRIPTION_VALIDATOR: BuildFormValidator = {
   VALIDATORS: [ Validators.minLength(3), Validators.maxLength(10000) ],
   MESSAGES: {
-    'minlength': $localize`Video description must be at least 3 characters long.`,
-    'maxlength': $localize`Video description cannot be more than 10000 characters long.`
+    minlength: $localize`Video description must be at least 3 characters long.`,
+    maxlength: $localize`Video description cannot be more than 10000 characters long.`
   }
 }
 
 export const VIDEO_TAG_VALIDATOR: BuildFormValidator = {
   VALIDATORS: [ Validators.minLength(2), Validators.maxLength(30) ],
   MESSAGES: {
-    'minlength': $localize`A tag should be more than 2 characters long.`,
-    'maxlength': $localize`A tag should be less than 30 characters long.`
+    minlength: $localize`A tag should be more than 2 characters long.`,
+    maxlength: $localize`A tag should be less than 30 characters long.`
   }
 }
 
 export const VIDEO_TAGS_ARRAY_VALIDATOR: BuildFormValidator = {
   VALIDATORS: [ Validators.maxLength(5), arrayTagLengthValidator() ],
   MESSAGES: {
-    'maxlength': $localize`A maximum of 5 tags can be used on a video.`,
-    'arrayTagLength': $localize`A tag should be more than 2, and less than 30 characters long.`
+    maxlength: $localize`A maximum of 5 tags can be used on a video.`,
+    arrayTagLength: $localize`A tag should be more than 1 and less than 30 characters long.`
   }
 }
 
 export const VIDEO_SUPPORT_VALIDATOR: BuildFormValidator = {
   VALIDATORS: [ Validators.minLength(3), Validators.maxLength(1000) ],
   MESSAGES: {
-    'minlength': $localize`Video support must be at least 3 characters long.`,
-    'maxlength': $localize`Video support cannot be more than 1000 characters long.`
+    minlength: $localize`Video support must be at least 3 characters long.`,
+    maxlength: $localize`Video support cannot be more than 1000 characters long.`
   }
 }
 
 export const VIDEO_SCHEDULE_PUBLICATION_AT_VALIDATOR: BuildFormValidator = {
-  VALIDATORS: [ ],
+  VALIDATORS: [ ], // Required is set dynamically
   MESSAGES: {
-    'required': $localize`A date is required to schedule video update.`
+    required: $localize`A date is required to schedule video update.`
   }
 }
 
@@ -92,10 +101,10 @@ function arrayTagLengthValidator (min = 2, max = 30): ValidatorFn {
   return (control: AbstractControl): ValidationErrors => {
     const array = control.value as Array<string>
 
-    if (array.every(e => e.length > min && e.length < max)) {
+    if (array.every(e => e.length >= min && e.length <= max)) {
       return null
     }
 
-    return { 'arrayTagLength': true }
+    return { arrayTagLength: true }
   }
 }