aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'server/helpers')
-rw-r--r--server/helpers/custom-validators/pods.js9
-rw-r--r--server/helpers/custom-validators/videos.js6
2 files changed, 7 insertions, 8 deletions
diff --git a/server/helpers/custom-validators/pods.js b/server/helpers/custom-validators/pods.js
index 0154a2424..8bb3733ff 100644
--- a/server/helpers/custom-validators/pods.js
+++ b/server/helpers/custom-validators/pods.js
@@ -5,14 +5,19 @@ const validator = require('express-validator').validator
5const miscValidators = require('./misc') 5const miscValidators = require('./misc')
6 6
7const podsValidators = { 7const podsValidators = {
8 isEachUniqueHostValid 8 isEachUniqueHostValid,
9 isHostValid
10}
11
12function isHostValid (host) {
13 return validator.isURL(host) && host.split('://').length === 1
9} 14}
10 15
11function isEachUniqueHostValid (hosts) { 16function isEachUniqueHostValid (hosts) {
12 return miscValidators.isArray(hosts) && 17 return miscValidators.isArray(hosts) &&
13 hosts.length !== 0 && 18 hosts.length !== 0 &&
14 hosts.every(function (host) { 19 hosts.every(function (host) {
15 return validator.isURL(host) && host.split('://').length === 1 && hosts.indexOf(host) === hosts.lastIndexOf(host) 20 return isHostValid(host) && hosts.indexOf(host) === hosts.lastIndexOf(host)
16 }) 21 })
17} 22}
18 23
diff --git a/server/helpers/custom-validators/videos.js b/server/helpers/custom-validators/videos.js
index be8256a80..da857ba5f 100644
--- a/server/helpers/custom-validators/videos.js
+++ b/server/helpers/custom-validators/videos.js
@@ -15,7 +15,6 @@ const videosValidators = {
15 isVideoDurationValid, 15 isVideoDurationValid,
16 isVideoInfoHashValid, 16 isVideoInfoHashValid,
17 isVideoNameValid, 17 isVideoNameValid,
18 isVideoPodHostValid,
19 isVideoTagsValid, 18 isVideoTagsValid,
20 isVideoThumbnailValid, 19 isVideoThumbnailValid,
21 isVideoThumbnail64Valid 20 isVideoThumbnail64Valid
@@ -74,11 +73,6 @@ function isVideoNameValid (value) {
74 return validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.NAME) 73 return validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.NAME)
75} 74}
76 75
77function isVideoPodHostValid (value) {
78 // TODO: set options (TLD...)
79 return validator.isURL(value)
80}
81
82function isVideoTagsValid (tags) { 76function isVideoTagsValid (tags) {
83 return miscValidators.isArray(tags) && 77 return miscValidators.isArray(tags) &&
84 validator.isInt(tags.length, VIDEOS_CONSTRAINTS_FIELDS.TAGS) && 78 validator.isInt(tags.length, VIDEOS_CONSTRAINTS_FIELDS.TAGS) &&