Fix video_share_url duplicate key in transcoding job

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

diff --git a/server/controllers/activitypub/inbox.ts b/server/controllers/activitypub/inbox.ts
index 243ae738191e7f67ce538359c988fd820e01d633..df041aebf6c72fc22b7556576b11fe8e9446d0b7 100644 (file)
--- a/server/controllers/activitypub/inbox.ts
+++ b/server/controllers/activitypub/inbox.ts
@@ -1,25 +1,26 @@
 import * as express from 'express'
 import { Activity, ActivityPubCollection, ActivityPubOrderedCollection, RootActivity } from '../../../shared'
-import { logger } from '../../helpers'
 import { isActivityValid } from '../../helpers/custom-validators/activitypub/activity'
+import { logger } from '../../helpers/logger'
 import { processActivities } from '../../lib/activitypub/process/process'
 import { asyncMiddleware, checkSignature, localAccountValidator, signatureValidator } from '../../middlewares'
 import { activityPubValidator } from '../../middlewares/validators/activitypub/activity'
+import { ActorModel } from '../../models/activitypub/actor'
 
 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(activityPubValidator),
   asyncMiddleware(inboxController)
 )
 
@@ -44,11 +45,20 @@ async function inboxController (req: express.Request, res: express.Response, nex
   }
 
   // Only keep activities we are able to process
-  logger.debug('Filtering activities...', { activities })
+  logger.debug('Filtering %d activities...', activities.length)
   activities = activities.filter(a => isActivityValid(a))
   logger.debug('We keep %d activities.', activities.length, { activities })
 
-  await processActivities(activities, res.locals.account)
+  let specificActor: ActorModel = undefined
+  if (res.locals.account) {
+    specificActor = res.locals.account
+  } else if (res.locals.videoChannel) {
+    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()
 }