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 { asyncMiddleware, checkSignature, localAccountValidator, localVideoChannelValidator, signatureValidator } from '../../middlewares'
import { activityPubValidator } from '../../middlewares/validators/activitypub/activity'
-import { ActorModel } from '../../models/activitypub/actor'
+import { VideoChannelModel } from '../../models/video/video-channel'
+import { AccountModel } from '../../models/account/account'
const inboxRouter = express.Router()
inboxRouter.post('/accounts/:name/inbox',
signatureValidator,
asyncMiddleware(checkSignature),
- localAccountValidator,
+ asyncMiddleware(localAccountValidator),
+ asyncMiddleware(activityPubValidator),
+ asyncMiddleware(inboxController)
+)
+inboxRouter.post('/video-channels/:name/inbox',
+ signatureValidator,
+ asyncMiddleware(checkSignature),
+ asyncMiddleware(localVideoChannelValidator),
asyncMiddleware(activityPubValidator),
asyncMiddleware(inboxController)
)
activities = activities.filter(a => isActivityValid(a))
logger.debug('We keep %d activities.', activities.length, { activities })
- let specificActor: ActorModel = undefined
+ let accountOrChannel: VideoChannelModel | AccountModel
if (res.locals.account) {
- specificActor = res.locals.account
+ accountOrChannel = res.locals.account
} else if (res.locals.videoChannel) {
- specificActor = res.locals.videoChannel
+ accountOrChannel = res.locals.videoChannel
}
- await processActivities(activities, res.locals.signature.actor, specificActor)
+ logger.info('Receiving inbox requests for %d activities by %s.', activities.length, res.locals.signature.actor.url)
+
+ await processActivities(activities, res.locals.signature.actor, accountOrChannel ? accountOrChannel.Actor : undefined)
res.status(204).end()
}