X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Factivitypub%2Finbox.ts;h=73fbd94aa3fd3a27a822914bd2ea366783f0f113;hb=49799b165e3cd547f1dbb23bd31369baca0b39da;hp=bd0d7a9c8bb6ac4b0f27114664eaeba227afabc6;hpb=285fe7c93072b2a8e6a9af6b7e8ffcdefcffbddf;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/activitypub/inbox.ts b/server/controllers/activitypub/inbox.ts index bd0d7a9c8..73fbd94aa 100644 --- a/server/controllers/activitypub/inbox.ts +++ b/server/controllers/activitypub/inbox.ts @@ -19,7 +19,7 @@ inboxRouter.post('/inbox', inboxRouter.post('/accounts/:name/inbox', signatureValidator, asyncMiddleware(checkSignature), - localAccountValidator, + 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()