Add author_url in oembed response

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

diff --git a/server/controllers/activitypub/inbox.ts b/server/controllers/activitypub/inbox.ts
index bfcb7b3695200b994b15c354c6a0ab97a1eac4cb..73fbd94aa3fd3a27a822914bd2ea366783f0f113 100644 (file)
--- a/server/controllers/activitypub/inbox.ts
+++ b/server/controllers/activitypub/inbox.ts
@@ -12,15 +12,15 @@ const inboxRouter = express.Router()
 inboxRouter.post('/inbox',
   signatureValidator,
   asyncMiddleware(checkSignature),
-  activityPubValidator,
+  asyncMiddleware(activityPubValidator),
   asyncMiddleware(inboxController)
 )
 
-inboxRouter.post('/account/:name/inbox',
+inboxRouter.post('/accounts/:name/inbox',
   signatureValidator,
   asyncMiddleware(checkSignature),
-  localAccountValidator,
-  activityPubValidator,
+  asyncMiddleware(localAccountValidator),
+  asyncMiddleware(activityPubValidator),
   asyncMiddleware(inboxController)
 )
 
@@ -36,6 +36,8 @@ async function inboxController (req: express.Request, res: express.Response, nex
   const rootActivity: RootActivity = req.body
   let activities: Activity[] = []
 
+  console.log(rootActivity)
+
   if ([ 'Collection', 'CollectionPage' ].indexOf(rootActivity.type) !== -1) {
     activities = (rootActivity as ActivityPubCollection).items
   } else if ([ 'OrderedCollection', 'OrderedCollectionPage' ].indexOf(rootActivity.type) !== -1) {
@@ -56,6 +58,8 @@ async function inboxController (req: express.Request, res: express.Response, nex
     specificActor = res.locals.videoChannel
   }
 
+  logger.info('Receiving inbox requests for %d activities by %s.', activities.length, res.locals.signature.actor.url)
+
   await processActivities(activities, res.locals.signature.actor, specificActor)
 
   res.status(204).end()