From 8d468a16fd33ec2660c3c59b3f7def53eb0cc4a1 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 23 Nov 2017 17:53:38 +0100 Subject: Cleanup helpers --- server/helpers/custom-validators/accounts.ts | 7 -- server/helpers/custom-validators/video-channels.ts | 5 - server/helpers/custom-validators/videos.ts | 113 ++++----------------- 3 files changed, 21 insertions(+), 104 deletions(-) (limited to 'server/helpers/custom-validators') diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts index 088d5fc8f..83540e545 100644 --- a/server/helpers/custom-validators/accounts.ts +++ b/server/helpers/custom-validators/accounts.ts @@ -14,12 +14,6 @@ function isAccountNameValid (value: string) { return isUserUsernameValid(value) } -function isAccountNameWithHostValid (value: string) { - const [ name, host ] = value.split('@') - - return isAccountNameValid(name) && isHostValid(host) -} - function checkVideoAccountExists (id: string, res: express.Response, callback: () => void) { let promise: Promise if (validator.isInt(id)) { @@ -48,6 +42,5 @@ function checkVideoAccountExists (id: string, res: express.Response, callback: ( export { checkVideoAccountExists, - isAccountNameWithHostValid, isAccountNameValid } diff --git a/server/helpers/custom-validators/video-channels.ts b/server/helpers/custom-validators/video-channels.ts index 5787c3850..5de01f74b 100644 --- a/server/helpers/custom-validators/video-channels.ts +++ b/server/helpers/custom-validators/video-channels.ts @@ -24,10 +24,6 @@ function isVideoChannelNameValid (value: string) { return exists(value) && validator.isLength(value, VIDEO_CHANNELS_CONSTRAINTS_FIELDS.NAME) } -function isVideoChannelUUIDValid (value: string) { - return exists(value) && validator.isUUID('' + value, 4) -} - function checkVideoChannelExists (id: string, res: express.Response, callback: () => void) { let promise: Promise if (validator.isInt(id)) { @@ -57,7 +53,6 @@ function checkVideoChannelExists (id: string, res: express.Response, callback: ( export { isVideoChannelDescriptionValid, isVideoChannelNameValid, - isVideoChannelUUIDValid, checkVideoChannelExists, isVideoChannelUrlValid } diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts index 07aadadb1..c893d2c7c 100644 --- a/server/helpers/custom-validators/videos.ts +++ b/server/helpers/custom-validators/videos.ts @@ -1,37 +1,25 @@ -import * as Promise from 'bluebird' -import * as express from 'express' +import * as Bluebird from 'bluebird' +import { Response } from 'express' import 'express-validator' import { values } from 'lodash' import 'multer' import * as validator from 'validator' import { VideoRateType } from '../../../shared' -import { logger } from '../../helpers' -import { - CONSTRAINTS_FIELDS, - database as db, - VIDEO_CATEGORIES, - VIDEO_LANGUAGES, - VIDEO_LICENCES, - VIDEO_PRIVACIES, - VIDEO_RATE_TYPES -} from '../../initializers' -import { VideoInstance } from '../../models' +import { CONSTRAINTS_FIELDS, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_RATE_TYPES } from '../../initializers' +import { database as db } from '../../initializers/database' +import { VideoInstance } from '../../models/video/video-interface' +import { logger } from '../logger' import { isActivityPubUrlValid } from './activitypub/misc' import { exists, isArray } from './misc' +import { VIDEO_PRIVACIES } from '../../initializers/constants' const VIDEOS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEOS const VIDEO_ABUSES_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_ABUSES -const VIDEO_EVENTS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_EVENTS function isVideoCategoryValid (value: number) { return VIDEO_CATEGORIES[value] !== undefined } -// Maybe we don't know the remote category, but that doesn't matter -function isRemoteVideoCategoryValid (value: string) { - return validator.isInt('' + value) -} - function isVideoUrlValid (value: string) { return isActivityPubUrlValid(value) } @@ -40,29 +28,10 @@ function isVideoLicenceValid (value: number) { return VIDEO_LICENCES[value] !== undefined } -function isVideoPrivacyValid (value: string) { - return VIDEO_PRIVACIES[value] !== undefined -} - -// Maybe we don't know the remote privacy setting, but that doesn't matter -function isRemoteVideoPrivacyValid (value: string) { - return validator.isInt('' + value) -} - -// Maybe we don't know the remote licence, but that doesn't matter -function isRemoteVideoLicenceValid (value: string) { - return validator.isInt('' + value) -} - function isVideoLanguageValid (value: number) { return value === null || VIDEO_LANGUAGES[value] !== undefined } -// Maybe we don't know the remote language, but that doesn't matter -function isRemoteVideoLanguageValid (value: string) { - return validator.isInt('' + value) -} - function isVideoNSFWValid (value: any) { return typeof value === 'boolean' || (typeof value === 'string' && validator.isBoolean(value)) } @@ -93,14 +62,6 @@ function isVideoTagsValid (tags: string[]) { tags.every(tag => isVideoTagValid(tag)) } -function isVideoThumbnailValid (value: string) { - return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.THUMBNAIL) -} - -function isVideoThumbnailDataValid (value: string) { - return exists(value) && validator.isByteLength(value, VIDEOS_CONSTRAINTS_FIELDS.THUMBNAIL_DATA) -} - function isVideoAbuseReasonValid (value: string) { return exists(value) && validator.isLength(value, VIDEO_ABUSES_CONSTRAINTS_FIELDS.REASON) } @@ -109,18 +70,6 @@ function isVideoViewsValid (value: string) { return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.VIEWS) } -function isVideoLikesValid (value: string) { - return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.LIKES) -} - -function isVideoDislikesValid (value: string) { - return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.DISLIKES) -} - -function isVideoEventCountValid (value: string) { - return exists(value) && validator.isInt(value + '', VIDEO_EVENTS_CONSTRAINTS_FIELDS.COUNT) -} - function isVideoRatingTypeValid (value: string) { return values(VIDEO_RATE_TYPES).indexOf(value as VideoRateType) !== -1 } @@ -141,24 +90,16 @@ function isVideoFile (files: { [ fieldname: string ]: Express.Multer.File[] } | return new RegExp('^video/(webm|mp4|ogg)$', 'i').test(file.mimetype) } -function isVideoFileSizeValid (value: string) { - return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.FILE_SIZE) -} - -function isVideoFileResolutionValid (value: string) { - return exists(value) && validator.isInt(value + '') -} - -function isVideoFileExtnameValid (value: string) { - return VIDEOS_CONSTRAINTS_FIELDS.EXTNAME.indexOf(value) !== -1 -} - function isVideoFileInfoHashValid (value: string) { return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.INFO_HASH) } -function checkVideoExists (id: string, res: express.Response, callback: () => void) { - let promise: Promise +function isVideoPrivacyValid (value: string) { + return VIDEO_PRIVACIES[value] !== undefined +} + +function checkVideoExists (id: string, res: Response, callback: () => void) { + let promise: Bluebird if (validator.isInt(id)) { promise = db.Video.loadAndPopulateAccountAndServerAndTags(+id) } else { // UUID @@ -168,17 +109,17 @@ function checkVideoExists (id: string, res: express.Response, callback: () => vo promise.then(video => { if (!video) { return res.status(404) - .json({ error: 'Video not found' }) - .end() + .json({ error: 'Video not found' }) + .end() } res.locals.video = video callback() }) - .catch(err => { - logger.error('Error in video request validator.', err) - return res.sendStatus(500) - }) + .catch(err => { + logger.error('Error in video request validator.', err) + return res.sendStatus(500) + }) } // --------------------------------------------------------------------------- @@ -193,25 +134,13 @@ export { isVideoFileInfoHashValid, isVideoNameValid, isVideoTagsValid, - isVideoThumbnailValid, - isVideoThumbnailDataValid, - isVideoFileExtnameValid, isVideoAbuseReasonValid, isVideoFile, isVideoViewsValid, - isVideoLikesValid, isVideoRatingTypeValid, - isVideoDislikesValid, - isVideoEventCountValid, - isVideoFileSizeValid, - isVideoPrivacyValid, - isRemoteVideoPrivacyValid, isVideoDurationValid, - isVideoFileResolutionValid, - checkVideoExists, isVideoTagValid, - isRemoteVideoCategoryValid, - isRemoteVideoLicenceValid, isVideoUrlValid, - isRemoteVideoLanguageValid + isVideoPrivacyValid, + checkVideoExists } -- cgit v1.2.3