Merge branch 'release/3.3.0' into develop

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

diff --git a/server/controllers/activitypub/index.ts b/server/controllers/activitypub/index.ts
index 7a4602b377b743d43df58bf795430ae2f565ea22..7e81902af7249147eeb2c8a3a4166bbca497b33a 100644 (file)
--- a/server/controllers/activitypub/index.ts
+++ b/server/controllers/activitypub/index.ts
@@ -1,15 +1,16 @@
 import * as express from 'express'
-
-import { badRequest } from '../../helpers'
+import { activityPubClientRouter } from './client'
 import { inboxRouter } from './inbox'
+import { outboxRouter } from './outbox'
 
-const remoteRouter = express.Router()
+const activityPubRouter = express.Router()
 
-remoteRouter.use('/inbox', inboxRouter)
-remoteRouter.use('/*', badRequest)
+activityPubRouter.use('/', inboxRouter)
+activityPubRouter.use('/', outboxRouter)
+activityPubRouter.use('/', activityPubClientRouter)
 
 // ---------------------------------------------------------------------------
 
 export {
-  remoteRouter
+  activityPubRouter
 }