+import { StatsManager } from '@server/lib/stat-manager'
import { Activity, ActivityType } from '../../../../shared/models/activitypub'
-import { checkUrlsSameHost, getAPId } from '../../../helpers/activitypub'
import { logger } from '../../../helpers/logger'
-import { ActorModel } from '../../../models/activitypub/actor'
+import { APProcessorOptions } from '../../../types/activitypub-processor.model'
+import { MActorDefault, MActorSignature } from '../../../types/models'
+import { getAPId } from '../activity'
+import { getOrCreateAPActor } from '../actors'
+import { checkUrlsSameHost } from '../url'
import { processAcceptActivity } from './process-accept'
import { processAnnounceActivity } from './process-announce'
import { processCreateActivity } from './process-create'
import { processDeleteActivity } from './process-delete'
+import { processDislikeActivity } from './process-dislike'
+import { processFlagActivity } from './process-flag'
import { processFollowActivity } from './process-follow'
import { processLikeActivity } from './process-like'
import { processRejectActivity } from './process-reject'
import { processUndoActivity } from './process-undo'
import { processUpdateActivity } from './process-update'
-import { getOrCreateActorAndServerAndModel } from '../actor'
-import { processDislikeActivity } from './process-dislike'
-import { processFlagActivity } from './process-flag'
import { processViewActivity } from './process-view'
-import { APProcessorOptions } from '../../../typings/activitypub-processor.model'
const processActivity: { [ P in ActivityType ]: (options: APProcessorOptions<Activity>) => Promise<any> } = {
Create: processCreateActivity,
async function processActivities (
activities: Activity[],
options: {
- signatureActor?: ActorModel
- inboxActor?: ActorModel
+ signatureActor?: MActorSignature
+ inboxActor?: MActorDefault
outboxUrl?: string
fromFetch?: boolean
} = {}
) {
const { outboxUrl, signatureActor, inboxActor, fromFetch = false } = options
- const actorsCache: { [ url: string ]: ActorModel } = {}
+ const actorsCache: { [ url: string ]: MActorSignature } = {}
for (const activity of activities) {
if (!signatureActor && [ 'Create', 'Announce', 'Like' ].includes(activity.type) === false) {
continue
}
- const byActor = signatureActor || actorsCache[actorUrl] || await getOrCreateActorAndServerAndModel(actorUrl)
+ const byActor = signatureActor || actorsCache[actorUrl] || await getOrCreateAPActor(actorUrl)
actorsCache[actorUrl] = byActor
const activityProcessor = processActivity[activity.type]
}
try {
- await activityProcessor({ activity, byActor, inboxActor: inboxActor, fromFetch })
+ await activityProcessor({ activity, byActor, inboxActor, fromFetch })
+
+ StatsManager.Instance.addInboxProcessedSuccess(activity.type)
} catch (err) {
logger.warn('Cannot process activity %s.', activity.type, { err })
+
+ StatsManager.Instance.addInboxProcessedError(activity.type)
}
}
}