Add server plugin filter hooks for import with torrent and url (#2621)

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

diff --git a/server/middlewares/validators/feeds.ts b/server/middlewares/validators/feeds.ts
index dd362619d6a0e2c4f776e3f0b598988f99a1b8ff..f34c2b174527085750e48ac5bc11c4e3e549bdae 100644 (file)
--- a/server/middlewares/validators/feeds.ts
+++ b/server/middlewares/validators/feeds.ts
@@ -1,16 +1,48 @@
 import * as express from 'express'
-import { param, query } from 'express-validator/check'
-import { doesAccountIdExist, doesAccountNameWithHostExist } from '../../helpers/custom-validators/accounts'
+import { param, query } from 'express-validator'
 import { isIdOrUUIDValid, isIdValid } from '../../helpers/custom-validators/misc'
 import { logger } from '../../helpers/logger'
 import { areValidationErrors } from './utils'
 import { isValidRSSFeed } from '../../helpers/custom-validators/feeds'
-import { doesVideoChannelIdExist, doesVideoChannelNameWithHostExist } from '../../helpers/custom-validators/video-channels'
-import { doesVideoExist } from '../../helpers/custom-validators/videos'
+import { doesVideoExist } from '../../helpers/middlewares/videos'
+import {
+  doesAccountIdExist,
+  doesAccountNameWithHostExist,
+  doesVideoChannelIdExist,
+  doesVideoChannelNameWithHostExist
+} from '../../helpers/middlewares'
 
-const videoFeedsValidator = [
+const feedsFormatValidator = [
   param('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'),
-  query('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'),
+  query('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)')
+]
+
+function setFeedFormatContentType (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const format = req.query.format || req.params.format || 'rss'
+
+  let acceptableContentTypes: string[]
+  if (format === 'atom' || format === 'atom1') {
+    acceptableContentTypes = [ 'application/atom+xml', 'application/xml', 'text/xml' ]
+  } else if (format === 'json' || format === 'json1') {
+    acceptableContentTypes = [ 'application/json' ]
+  } else if (format === 'rss' || format === 'rss2') {
+    acceptableContentTypes = [ 'application/rss+xml', 'application/xml', 'text/xml' ]
+  } else {
+    acceptableContentTypes = [ 'application/xml', 'text/xml' ]
+  }
+
+  if (req.accepts(acceptableContentTypes)) {
+    res.set('Content-Type', req.accepts(acceptableContentTypes) as string)
+  } else {
+    return res.status(406).send({
+      message: `You should accept at least one of the following content-types: ${acceptableContentTypes.join(', ')}`
+    }).end()
+  }
+
+  return next()
+}
+
+const videoFeedsValidator = [
   query('accountId').optional().custom(isIdValid),
   query('accountName').optional(),
   query('videoChannelId').optional().custom(isIdValid),
@@ -31,8 +63,6 @@ const videoFeedsValidator = [
 ]
 
 const videoCommentsFeedsValidator = [
-  param('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'),
-  query('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'),
   query('videoId').optional().custom(isIdOrUUIDValid),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
@@ -49,6 +79,8 @@ const videoCommentsFeedsValidator = [
 // ---------------------------------------------------------------------------
 
 export {
+  feedsFormatValidator,
+  setFeedFormatContentType,
   videoFeedsValidator,
   videoCommentsFeedsValidator
 }