Add migrations

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / oembed.ts

diff --git a/server/middlewares/validators/oembed.ts b/server/middlewares/validators/oembed.ts
index 31f06dc65e9f747ecfbd19d70726b5fb879ba88a..ab4dbb4d1814438b33b7821b9bcb11993ed02b0f 100644 (file)
--- a/server/middlewares/validators/oembed.ts
+++ b/server/middlewares/validators/oembed.ts
@@ -1,12 +1,14 @@
 import * as express from 'express'
-import { query } from 'express-validator/check'
+import { query } from 'express-validator'
 import { join } from 'path'
-import { isIdOrUUIDValid, isTestInstance, logger } from '../../helpers'
-import { CONFIG } from '../../initializers'
+import { isTestInstance } from '../../helpers/core-utils'
+import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
+import { logger } from '../../helpers/logger'
 import { areValidationErrors } from './utils'
-import { isVideoExist } from '../../helpers/custom-validators/videos'
+import { WEBSERVER } from '../../initializers/constants'
+import { doesVideoExist } from '../../helpers/middlewares'
 
-const urlShouldStartWith = CONFIG.WEBSERVER.SCHEME + '://' + join(CONFIG.WEBSERVER.HOST, 'videos', 'watch') + '/'
+const urlShouldStartWith = WEBSERVER.SCHEME + '://' + join(WEBSERVER.HOST, 'videos', 'watch') + '/'
 const videoWatchRegex = new RegExp('([^/]+)$')
 const isURLOptions = {
   require_host: true,
@@ -35,8 +37,11 @@ const oembedValidator = [
                 .end()
     }
 
-    const startIsOk = req.query.url.startsWith(urlShouldStartWith)
-    const matches = videoWatchRegex.exec(req.query.url)
+    const url = req.query.url as string
+
+    const startIsOk = url.startsWith(urlShouldStartWith)
+    const matches = videoWatchRegex.exec(url)
+
     if (startIsOk === false || matches === null) {
       return res.status(400)
                 .json({ error: 'Invalid url.' })
@@ -50,7 +55,7 @@ const oembedValidator = [
                 .end()
     }
 
-    if (!await isVideoExist(videoId, res)) return
+    if (!await doesVideoExist(videoId, res)) return
 
     return next()
   }