Merge branch 'release/3.3.0' into develop

[github/Chocobozzz/PeerTube.git] / server / helpers / custom-validators / video-imports.ts

diff --git a/server/helpers/custom-validators/video-imports.ts b/server/helpers/custom-validators/video-imports.ts
index 0063d3337fd96749c65396f3514363577e9587e1..dbf6a3504a9aa8e9b67009e488eb207fa3a0840b 100644 (file)
--- a/server/helpers/custom-validators/video-imports.ts
+++ b/server/helpers/custom-validators/video-imports.ts
@@ -2,9 +2,6 @@ import 'multer'
 import validator from 'validator'
 import { CONSTRAINTS_FIELDS, MIMETYPES, VIDEO_IMPORT_STATES } from '../../initializers/constants'
 import { exists, isFileValid } from './misc'
-import * as express from 'express'
-import { VideoImportModel } from '../../models/video/video-import'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 
 function isVideoImportTargetUrlValid (url: string) {
   const isURLOptions = {
@@ -32,26 +29,10 @@ function isVideoImportTorrentFile (files: { [ fieldname: string ]: Express.Multe
   return isFileValid(files, videoTorrentImportRegex, 'torrentfile', CONSTRAINTS_FIELDS.VIDEO_IMPORTS.TORRENT_FILE.FILE_SIZE.max, true)
 }
 
-async function doesVideoImportExist (id: number, res: express.Response) {
-  const videoImport = await VideoImportModel.loadAndPopulateVideo(id)
-
-  if (!videoImport) {
-    res.status(HttpStatusCode.NOT_FOUND_404)
-       .json({ error: 'Video import not found' })
-       .end()
-
-    return false
-  }
-
-  res.locals.videoImport = videoImport
-  return true
-}
-
 // ---------------------------------------------------------------------------
 
 export {
   isVideoImportStateValid,
   isVideoImportTargetUrlValid,
-  doesVideoImportExist,
   isVideoImportTorrentFile
 }