X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Flib%2Factivitypub%2Fprocess%2Fprocess.ts;h=da91675ced3d7622f5fdb7505837a775aa043b4a;hb=c73e83da283c6d4eb094e384d59c4f8eb221507d;hp=6135973411c7f373700f9b0d046fdea7805ba0b4;hpb=c986175d68a18e96fbd41537a05c7796a2c64f38;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/process/process.ts b/server/lib/activitypub/process/process.ts
index 613597341..da91675ce 100644
--- a/server/lib/activitypub/process/process.ts
+++ b/server/lib/activitypub/process/process.ts
@@ -1,35 +1,50 @@
-import { Activity, ActivityType } from '../../../../shared/models/activitypub/activity'
-import { AccountInstance } from '../../../models/account/account-interface'
+import { Activity, ActivityType } from '../../../../shared/models/activitypub'
+import { getActorUrl } from '../../../helpers/activitypub'
+import { logger } from '../../../helpers/logger'
+import { ActorModel } from '../../../models/activitypub/actor'
 import { processAcceptActivity } from './process-accept'
-import { processAddActivity } from './process-add'
 import { processAnnounceActivity } from './process-announce'
 import { processCreateActivity } from './process-create'
 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'
-import { logger } from '../../../helpers/logger'
 
-const processActivity: { [ P in ActivityType ]: (activity: Activity, inboxAccount?: AccountInstance) => Promise<any> } = {
+const processActivity: { [ P in ActivityType ]: (activity: Activity, inboxActor?: ActorModel) => Promise<any> } = {
   Create: processCreateActivity,
-  Add: processAddActivity,
   Update: processUpdateActivity,
   Delete: processDeleteActivity,
   Follow: processFollowActivity,
   Accept: processAcceptActivity,
+  Reject: processRejectActivity,
   Announce: processAnnounceActivity,
-  Undo: processUndoActivity
+  Undo: processUndoActivity,
+  Like: processLikeActivity
 }
 
-async function processActivities (activities: Activity[], inboxAccount?: AccountInstance) {
+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 && actorUrl !== signatureActor.url) {
+      logger.warn('Signature mismatch between %s and %s.', actorUrl, signatureActor.url)
+      continue
+    }
+
     const activityProcessor = processActivity[activity.type]
     if (activityProcessor === undefined) {
       logger.warn('Unknown activity type %s.', activity.type, { activityId: activity.id })
       continue
     }
 
-    await activityProcessor(activity, inboxAccount)
+    try {
+      await activityProcessor(activity, inboxActor)
+    } catch (err) {
+      logger.warn('Cannot process activity %s.', activity.type, { err })
+    }
   }
 }