diff options
Diffstat (limited to 'server/lib/activitypub/process/process.ts')
-rw-r--r-- | server/lib/activitypub/process/process.ts | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/server/lib/activitypub/process/process.ts b/server/lib/activitypub/process/process.ts index bfbf8053c..dfb60c1bf 100644 --- a/server/lib/activitypub/process/process.ts +++ b/server/lib/activitypub/process/process.ts | |||
@@ -1,8 +1,7 @@ | |||
1 | import { Activity, ActivityType } from '../../../../shared/models/activitypub' | 1 | import { Activity, ActivityType } from '../../../../shared/models/activitypub' |
2 | import { logger } from '../../../helpers' | 2 | import { logger } from '../../../helpers' |
3 | import { AccountModel } from '../../../models/account/account' | 3 | import { ActorModel } from '../../../models/activitypub/actor' |
4 | import { processAcceptActivity } from './process-accept' | 4 | import { processAcceptActivity } from './process-accept' |
5 | import { processAddActivity } from './process-add' | ||
6 | import { processAnnounceActivity } from './process-announce' | 5 | import { processAnnounceActivity } from './process-announce' |
7 | import { processCreateActivity } from './process-create' | 6 | import { processCreateActivity } from './process-create' |
8 | import { processDeleteActivity } from './process-delete' | 7 | import { processDeleteActivity } from './process-delete' |
@@ -11,9 +10,8 @@ import { processLikeActivity } from './process-like' | |||
11 | import { processUndoActivity } from './process-undo' | 10 | import { processUndoActivity } from './process-undo' |
12 | import { processUpdateActivity } from './process-update' | 11 | import { processUpdateActivity } from './process-update' |
13 | 12 | ||
14 | const processActivity: { [ P in ActivityType ]: (activity: Activity, inboxAccount?: AccountModel) => Promise<any> } = { | 13 | const processActivity: { [ P in ActivityType ]: (activity: Activity, inboxActor?: ActorModel) => Promise<any> } = { |
15 | Create: processCreateActivity, | 14 | Create: processCreateActivity, |
16 | Add: processAddActivity, | ||
17 | Update: processUpdateActivity, | 15 | Update: processUpdateActivity, |
18 | Delete: processDeleteActivity, | 16 | Delete: processDeleteActivity, |
19 | Follow: processFollowActivity, | 17 | Follow: processFollowActivity, |
@@ -23,11 +21,11 @@ const processActivity: { [ P in ActivityType ]: (activity: Activity, inboxAccoun | |||
23 | Like: processLikeActivity | 21 | Like: processLikeActivity |
24 | } | 22 | } |
25 | 23 | ||
26 | async function processActivities (activities: Activity[], signatureAccount?: AccountModel, inboxAccount?: AccountModel) { | 24 | async function processActivities (activities: Activity[], signatureActor?: ActorModel, inboxActor?: ActorModel) { |
27 | for (const activity of activities) { | 25 | for (const activity of activities) { |
28 | // When we fetch remote data, we don't have signature | 26 | // When we fetch remote data, we don't have signature |
29 | if (signatureAccount && activity.actor !== signatureAccount.url) { | 27 | if (signatureActor && activity.actor !== signatureActor.url) { |
30 | logger.warn('Signature mismatch between %s and %s.', activity.actor, signatureAccount.url) | 28 | logger.warn('Signature mismatch between %s and %s.', activity.actor, signatureActor.url) |
31 | continue | 29 | continue |
32 | } | 30 | } |
33 | 31 | ||
@@ -38,7 +36,7 @@ async function processActivities (activities: Activity[], signatureAccount?: Acc | |||
38 | } | 36 | } |
39 | 37 | ||
40 | try { | 38 | try { |
41 | await activityProcessor(activity, inboxAccount) | 39 | await activityProcessor(activity, inboxActor) |
42 | } catch (err) { | 40 | } catch (err) { |
43 | logger.warn('Cannot process activity %s.', activity.type, err) | 41 | logger.warn('Cannot process activity %s.', activity.type, err) |
44 | } | 42 | } |