import { Activity, ActivityType } from '../../../../shared/models/activitypub'
-import { logger } from '../../../helpers'
+import { getActorUrl } 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 { processDeleteActivity } from './process-delete'
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'
Delete: processDeleteActivity,
Follow: processFollowActivity,
Accept: processAcceptActivity,
+ Reject: processRejectActivity,
Announce: processAnnounceActivity,
Undo: processUndoActivity,
Like: processLikeActivity
async function processActivities (activities: Activity[], signatureActor?: ActorModel, inboxActor?: ActorModel) {
for (const activity of activities) {
+ const actorUrl = getActorUrl(activity.actor)
+
// When we fetch remote data, we don't have signature
- if (signatureActor && activity.actor !== signatureActor.url) {
- logger.warn('Signature mismatch between %s and %s.', activity.actor, signatureActor.url)
+ if (signatureActor && actorUrl !== signatureActor.url) {
+ logger.warn('Signature mismatch between %s and %s.', actorUrl, signatureActor.url)
continue
}
try {
await activityProcessor(activity, inboxActor)
} catch (err) {
- logger.warn('Cannot process activity %s.', activity.type, err)
+ logger.warn('Cannot process activity %s.', activity.type, { err })
}
}
}