Fix incorrect error logs

[github/Chocobozzz/PeerTube.git] / server / controllers / api / index.ts

diff --git a/server/controllers/api/index.ts b/server/controllers/api/index.ts
index 0876283a2022436aff4fa95ec0db666ac2a9cf11..d1d4ef7657bcca6514399bb17f46888d05579339 100644 (file)
--- a/server/controllers/api/index.ts
+++ b/server/controllers/api/index.ts
@@ -1,20 +1,25 @@
-import * as express from 'express'
-import * as RateLimit from 'express-rate-limit'
+import cors from 'cors'
+import express from 'express'
+import { buildRateLimiter } from '@server/middlewares'
+import { HttpStatusCode } from '../../../shared/models'
+import { badRequest } from '../../helpers/express-utils'
+import { CONFIG } from '../../initializers/config'
+import { abuseRouter } from './abuse'
+import { accountsRouter } from './accounts'
+import { blocklistRouter } from './blocklist'
+import { bulkRouter } from './bulk'
 import { configRouter } from './config'
+import { customPageRouter } from './custom-page'
 import { jobsRouter } from './jobs'
 import { oauthClientsRouter } from './oauth-clients'
+import { overviewsRouter } from './overviews'
+import { pluginRouter } from './plugins'
+import { searchRouter } from './search'
 import { serverRouter } from './server'
 import { usersRouter } from './users'
-import { accountsRouter } from './accounts'
-import { videosRouter } from './videos'
-import { badRequest } from '../../helpers/express-utils'
 import { videoChannelRouter } from './video-channel'
-import * as cors from 'cors'
-import { searchRouter } from './search'
-import { overviewsRouter } from './overviews'
 import { videoPlaylistRouter } from './video-playlist'
-import { CONFIG } from '../../initializers/config'
-import { pluginsRouter } from '../plugins'
+import { videosRouter } from './videos'
 
 const apiRouter = express.Router()
 
@@ -24,15 +29,15 @@ apiRouter.use(cors({
   credentials: true
 }))
 
-// FIXME: https://github.com/nfriedly/express-rate-limit/issues/138
-// @ts-ignore
-const apiRateLimiter = RateLimit({
+const apiRateLimiter = buildRateLimiter({
   windowMs: CONFIG.RATES_LIMIT.API.WINDOW_MS,
   max: CONFIG.RATES_LIMIT.API.MAX
 })
 apiRouter.use(apiRateLimiter)
 
 apiRouter.use('/server', serverRouter)
+apiRouter.use('/abuses', abuseRouter)
+apiRouter.use('/bulk', bulkRouter)
 apiRouter.use('/oauth-clients', oauthClientsRouter)
 apiRouter.use('/config', configRouter)
 apiRouter.use('/users', usersRouter)
@@ -43,7 +48,9 @@ apiRouter.use('/videos', videosRouter)
 apiRouter.use('/jobs', jobsRouter)
 apiRouter.use('/search', searchRouter)
 apiRouter.use('/overviews', overviewsRouter)
-apiRouter.use('/plugins', pluginsRouter)
+apiRouter.use('/plugins', pluginRouter)
+apiRouter.use('/custom-pages', customPageRouter)
+apiRouter.use('/blocklist', blocklistRouter)
 apiRouter.use('/ping', pong)
 apiRouter.use('/*', badRequest)
 
@@ -54,5 +61,5 @@ export { apiRouter }
 // ---------------------------------------------------------------------------
 
 function pong (req: express.Request, res: express.Response) {
-  return res.send('pong').status(200).end()
+  return res.send('pong').status(HttpStatusCode.OK_200).end()
 }