-import * as express from 'express'
-import { Activity, ActivityPubCollection, ActivityPubOrderedCollection, ActivityType, RootActivity } from '../../../shared'
-import { logger } from '../../helpers'
+import express from 'express'
+import { InboxManager } from '@server/lib/activitypub/inbox-manager'
+import { Activity, ActivityPubCollection, ActivityPubOrderedCollection, RootActivity } from '@shared/models'
+import { HttpStatusCode } from '../../../shared/models/http/http-error-codes'
import { isActivityValid } from '../../helpers/custom-validators/activitypub/activity'
-import { processCreateActivity, processUpdateActivity, processUndoActivity } from '../../lib'
-import { processAcceptActivity } from '../../lib/activitypub/process/process-accept'
-import { processAddActivity } from '../../lib/activitypub/process/process-add'
-import { processAnnounceActivity } from '../../lib/activitypub/process/process-announce'
-import { processDeleteActivity } from '../../lib/activitypub/process/process-delete'
-import { processFollowActivity } from '../../lib/activitypub/process/process-follow'
-import { asyncMiddleware, checkSignature, localAccountValidator, signatureValidator } from '../../middlewares'
+import { logger } from '../../helpers/logger'
+import {
+ asyncMiddleware,
+ checkSignature,
+ ensureIsLocalChannel,
+ localAccountValidator,
+ signatureValidator,
+ videoChannelsNameWithHostValidator
+} from '../../middlewares'
import { activityPubValidator } from '../../middlewares/validators/activitypub/activity'
-import { AccountInstance } from '../../models/account/account-interface'
-
-const processActivity: { [ P in ActivityType ]: (activity: Activity, inboxAccount?: AccountInstance) => Promise<any> } = {
- Create: processCreateActivity,
- Add: processAddActivity,
- Update: processUpdateActivity,
- Delete: processDeleteActivity,
- Follow: processFollowActivity,
- Accept: processAcceptActivity,
- Announce: processAnnounceActivity,
- Undo: processUndoActivity
-}
const inboxRouter = express.Router()
inboxRouter.post('/inbox',
signatureValidator,
asyncMiddleware(checkSignature),
- activityPubValidator,
- asyncMiddleware(inboxController)
+ asyncMiddleware(activityPubValidator),
+ inboxController
)
-inboxRouter.post('/account/:name/inbox',
+inboxRouter.post('/accounts/:name/inbox',
signatureValidator,
asyncMiddleware(checkSignature),
- localAccountValidator,
- activityPubValidator,
- asyncMiddleware(inboxController)
+ asyncMiddleware(localAccountValidator),
+ asyncMiddleware(activityPubValidator),
+ inboxController
+)
+inboxRouter.post('/video-channels/:nameWithHost/inbox',
+ signatureValidator,
+ asyncMiddleware(checkSignature),
+ asyncMiddleware(videoChannelsNameWithHostValidator),
+ ensureIsLocalChannel,
+ asyncMiddleware(activityPubValidator),
+ inboxController
)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-async function inboxController (req: express.Request, res: express.Response, next: express.NextFunction) {
+function inboxController (req: express.Request, res: express.Response) {
const rootActivity: RootActivity = req.body
- let activities: Activity[] = []
+ let activities: Activity[]
- if ([ 'Collection', 'CollectionPage' ].indexOf(rootActivity.type) !== -1) {
+ if ([ 'Collection', 'CollectionPage' ].includes(rootActivity.type)) {
activities = (rootActivity as ActivityPubCollection).items
- } else if ([ 'OrderedCollection', 'OrderedCollectionPage' ].indexOf(rootActivity.type) !== -1) {
- activities = (rootActivity as ActivityPubOrderedCollection).orderedItems
+ } else if ([ 'OrderedCollection', 'OrderedCollectionPage' ].includes(rootActivity.type)) {
+ activities = (rootActivity as ActivityPubOrderedCollection<Activity>).orderedItems
} else {
activities = [ rootActivity as Activity ]
}
// 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)
+ const accountOrChannel = res.locals.account || res.locals.videoChannel
- res.status(204).end()
-}
+ logger.info('Receiving inbox requests for %d activities by %s.', activities.length, res.locals.signature.actor.url)
-async function processActivities (activities: Activity[], inboxAccount?: AccountInstance) {
- for (const activity of activities) {
- const activityProcessor = processActivity[activity.type]
- if (activityProcessor === undefined) {
- logger.warn('Unknown activity type %s.', activity.type, { activityId: activity.id })
- continue
- }
+ InboxManager.Instance.addInboxMessage({
+ activities,
+ signatureActor: res.locals.signature.actor,
+ inboxActor: accountOrChannel
+ ? accountOrChannel.Actor
+ : undefined
+ })
- await activityProcessor(activity, inboxAccount)
- }
+ return res.status(HttpStatusCode.NO_CONTENT_204).end()
}