aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/middlewares
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-04-25 17:30:46 +0200
committerChocobozzz <me@florianbigard.com>2018-04-25 17:30:56 +0200
commite0ea4b1d550d20271a74f1b84e7b3babeec9e0b3 (patch)
treee730ee9b71f72bbbceb9bf38c8c53c1902bf51a6 /server/middlewares
parent170726f523ff48f89da45473fc53ca54784f43dd (diff)
downloadPeerTube-e0ea4b1d550d20271a74f1b84e7b3babeec9e0b3.tar.gz
PeerTube-e0ea4b1d550d20271a74f1b84e7b3babeec9e0b3.tar.zst
PeerTube-e0ea4b1d550d20271a74f1b84e7b3babeec9e0b3.zip
Implement video channel feeds
Diffstat (limited to 'server/middlewares')
-rw-r--r--server/middlewares/validators/feeds.ts10
1 files changed, 4 insertions, 6 deletions
diff --git a/server/middlewares/validators/feeds.ts b/server/middlewares/validators/feeds.ts
index 6a8cfce86..b55190559 100644
--- a/server/middlewares/validators/feeds.ts
+++ b/server/middlewares/validators/feeds.ts
@@ -1,11 +1,12 @@
1import * as express from 'express' 1import * as express from 'express'
2import { param, query } from 'express-validator/check' 2import { param, query } from 'express-validator/check'
3import { isAccountIdExist, isAccountNameValid, isLocalAccountNameExist } from '../../helpers/custom-validators/accounts' 3import { isAccountIdExist, isAccountNameValid } from '../../helpers/custom-validators/accounts'
4import { join } from 'path' 4import { join } from 'path'
5import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc' 5import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
6import { logger } from '../../helpers/logger' 6import { logger } from '../../helpers/logger'
7import { areValidationErrors } from './utils' 7import { areValidationErrors } from './utils'
8import { isValidRSSFeed } from '../../helpers/custom-validators/feeds' 8import { isValidRSSFeed } from '../../helpers/custom-validators/feeds'
9import { isVideoChannelExist } from '../../helpers/custom-validators/video-channels'
9 10
10const feedsValidator = [ 11const feedsValidator = [
11 param('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'), 12 param('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'),
@@ -18,11 +19,8 @@ const feedsValidator = [
18 19
19 if (areValidationErrors(req, res)) return 20 if (areValidationErrors(req, res)) return
20 21
21 if (req.query.accountId) { 22 if (req.query.accountId && !await isAccountIdExist(req.query.accountId, res)) return
22 if (!await isAccountIdExist(req.query.accountId, res)) return 23 if (req.query.videoChannelId && !await isVideoChannelExist(req.query.videoChannelId, res)) return
23 } else if (req.query.accountName) {
24 if (!await isLocalAccountNameExist(req.query.accountName, res)) return
25 }
26 24
27 return next() 25 return next()
28 } 26 }