import { Activity, ActivityType } from '../../../../shared/models/activitypub'
-import { getActorUrl } from '../../../helpers/activitypub'
+import { checkUrlsSameHost, getAPId } from '../../../helpers/activitypub'
import { logger } from '../../../helpers/logger'
-import { ActorModel } from '../../../models/activitypub/actor'
import { processAcceptActivity } from './process-accept'
import { processAnnounceActivity } from './process-announce'
import { processCreateActivity } from './process-create'
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'
+import { MActorDefault, MActorSignature } from '../../../typings/models'
-const processActivity: { [ P in ActivityType ]: (activity: Activity, byActor: ActorModel, inboxActor?: ActorModel) => Promise<any> } = {
+const processActivity: { [ P in ActivityType ]: (options: APProcessorOptions<Activity>) => Promise<any> } = {
Create: processCreateActivity,
Update: processUpdateActivity,
Delete: processDeleteActivity,
Reject: processRejectActivity,
Announce: processAnnounceActivity,
Undo: processUndoActivity,
- Like: processLikeActivity
+ Like: processLikeActivity,
+ Dislike: processDislikeActivity,
+ Flag: processFlagActivity,
+ View: processViewActivity
}
-async function processActivities (activities: Activity[], signatureActor?: ActorModel, inboxActor?: ActorModel) {
- const actorsCache: { [ url: string ]: ActorModel } = {}
+async function processActivities (
+ activities: Activity[],
+ options: {
+ signatureActor?: MActorSignature
+ inboxActor?: MActorDefault
+ outboxUrl?: string
+ fromFetch?: boolean
+ } = {}
+) {
+ const { outboxUrl, signatureActor, inboxActor, fromFetch = false } = options
+
+ const actorsCache: { [ url: string ]: MActorSignature } = {}
for (const activity of activities) {
- const actorUrl = getActorUrl(activity.actor)
+ if (!signatureActor && [ 'Create', 'Announce', 'Like' ].includes(activity.type) === false) {
+ logger.error('Cannot process activity %s (type: %s) without the actor signature.', activity.id, activity.type)
+ continue
+ }
+
+ const actorUrl = getAPId(activity.actor)
// When we fetch remote data, we don't have signature
if (signatureActor && actorUrl !== signatureActor.url) {
- logger.warn('Signature mismatch between %s and %s.', actorUrl, signatureActor.url)
+ logger.warn('Signature mismatch between %s and %s, skipping.', actorUrl, signatureActor.url)
+ continue
+ }
+
+ if (outboxUrl && checkUrlsSameHost(outboxUrl, actorUrl) !== true) {
+ logger.warn('Host mismatch between outbox URL %s and actor URL %s, skipping.', outboxUrl, actorUrl)
continue
}
}
try {
- await activityProcessor(activity, byActor, inboxActor)
+ await activityProcessor({ activity, byActor, inboxActor, fromFetch })
} catch (err) {
logger.warn('Cannot process activity %s.', activity.type, { err })
}