X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Fvideo-channels.ts;h=ded5d517147dd952bbda0955e9e0db0820f9041a;hb=4024c44f9027a32809931de0692d40d001df721c;hp=cbf150e53d29bd85ef37912cdcf918fb1c4e5731;hpb=92bf2f62995bbaa0402cb4657473ad8d5b6fcf8d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/custom-validators/video-channels.ts b/server/helpers/custom-validators/video-channels.ts index cbf150e53..ded5d5171 100644 --- a/server/helpers/custom-validators/video-channels.ts +++ b/server/helpers/custom-validators/video-channels.ts @@ -1,9 +1,5 @@ -import * as express from 'express' -import 'express-validator' -import 'multer' -import * as validator from 'validator' -import { CONFIG, CONSTRAINTS_FIELDS } from '../../initializers' -import { VideoChannelModel } from '../../models/video/video-channel' +import validator from 'validator' +import { CONSTRAINTS_FIELDS } from '../../initializers/constants' import { exists } from './misc' const VIDEO_CHANNELS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_CHANNELS @@ -20,49 +16,10 @@ function isVideoChannelSupportValid (value: string) { return value === null || (exists(value) && validator.isLength(value, VIDEO_CHANNELS_CONSTRAINTS_FIELDS.SUPPORT)) } -async function isLocalVideoChannelNameExist (name: string, res: express.Response) { - const videoChannel = await VideoChannelModel.loadLocalByNameAndPopulateAccount(name) - - return processVideoChannelExist(videoChannel, res) -} - -async function isVideoChannelIdExist (id: string, res: express.Response) { - let videoChannel: VideoChannelModel - if (validator.isInt(id)) { - videoChannel = await VideoChannelModel.loadAndPopulateAccount(+id) - } else { // UUID - videoChannel = await VideoChannelModel.loadByUUIDAndPopulateAccount(id) - } - - return processVideoChannelExist(videoChannel, res) -} - -async function isVideoChannelNameWithHostExist (nameWithDomain: string, res: express.Response) { - const videoChannel = await VideoChannelModel.loadByNameWithHostAndPopulateAccount(nameWithDomain) - - return processVideoChannelExist(videoChannel, res) -} - // --------------------------------------------------------------------------- export { - isVideoChannelNameWithHostExist, - isLocalVideoChannelNameExist, isVideoChannelDescriptionValid, isVideoChannelNameValid, - isVideoChannelSupportValid, - isVideoChannelIdExist -} - -function processVideoChannelExist (videoChannel: VideoChannelModel, res: express.Response) { - if (!videoChannel) { - res.status(404) - .json({ error: 'Video channel not found' }) - .end() - - return false - } - - res.locals.videoChannel = videoChannel - return true + isVideoChannelSupportValid }