aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/helpers
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-11-23 18:04:48 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-11-27 19:40:53 +0100
commitd4f1e94c89336255537b0b82913591f00e716201 (patch)
treec7d18e09a4f53eafc61de8cb0692c020b197512d /server/helpers
parent8d468a16fd33ec2660c3c59b3f7def53eb0cc4a1 (diff)
downloadPeerTube-d4f1e94c89336255537b0b82913591f00e716201.tar.gz
PeerTube-d4f1e94c89336255537b0b82913591f00e716201.tar.zst
PeerTube-d4f1e94c89336255537b0b82913591f00e716201.zip
Misc cleanup
Diffstat (limited to 'server/helpers')
-rw-r--r--server/helpers/custom-validators/accounts.ts5
-rw-r--r--server/helpers/custom-validators/videos.ts14
2 files changed, 13 insertions, 6 deletions
diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts
index 83540e545..fe0fc650a 100644
--- a/server/helpers/custom-validators/accounts.ts
+++ b/server/helpers/custom-validators/accounts.ts
@@ -1,14 +1,11 @@
1import * as Promise from 'bluebird' 1import * as Promise from 'bluebird'
2import * as validator from 'validator'
3import * as express from 'express' 2import * as express from 'express'
4import 'express-validator' 3import 'express-validator'
5 4import * as validator from 'validator'
6import { database as db } from '../../initializers' 5import { database as db } from '../../initializers'
7import { AccountInstance } from '../../models' 6import { AccountInstance } from '../../models'
8import { logger } from '../logger' 7import { logger } from '../logger'
9
10import { isUserUsernameValid } from './users' 8import { isUserUsernameValid } from './users'
11import { isHostValid } from './servers'
12 9
13function isAccountNameValid (value: string) { 10function isAccountNameValid (value: string) {
14 return isUserUsernameValid(value) 11 return isUserUsernameValid(value)
diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts
index c893d2c7c..205d8c62f 100644
--- a/server/helpers/custom-validators/videos.ts
+++ b/server/helpers/custom-validators/videos.ts
@@ -90,12 +90,20 @@ function isVideoFile (files: { [ fieldname: string ]: Express.Multer.File[] } |
90 return new RegExp('^video/(webm|mp4|ogg)$', 'i').test(file.mimetype) 90 return new RegExp('^video/(webm|mp4|ogg)$', 'i').test(file.mimetype)
91} 91}
92 92
93function isVideoPrivacyValid (value: string) {
94 return VIDEO_PRIVACIES[value] !== undefined
95}
96
93function isVideoFileInfoHashValid (value: string) { 97function isVideoFileInfoHashValid (value: string) {
94 return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.INFO_HASH) 98 return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.INFO_HASH)
95} 99}
96 100
97function isVideoPrivacyValid (value: string) { 101function isVideoFileResolutionValid (value: string) {
98 return VIDEO_PRIVACIES[value] !== undefined 102 return exists(value) && validator.isInt(value + '')
103}
104
105function isVideoFileSizeValid (value: string) {
106 return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.FILE_SIZE)
99} 107}
100 108
101function checkVideoExists (id: string, res: Response, callback: () => void) { 109function checkVideoExists (id: string, res: Response, callback: () => void) {
@@ -142,5 +150,7 @@ export {
142 isVideoTagValid, 150 isVideoTagValid,
143 isVideoUrlValid, 151 isVideoUrlValid,
144 isVideoPrivacyValid, 152 isVideoPrivacyValid,
153 isVideoFileResolutionValid,
154 isVideoFileSizeValid,
145 checkVideoExists 155 checkVideoExists
146} 156}