fix: delete tombstones and log failing activities #98

src/server/apsystem.test.ts

@@ -624,6 +624,73 @@ test('ActivityPubSystem - Handle Delete activity', async t => {
   t.falsy(isActivityPresent, 'The activity should be removed from the index/collection')
 })
 
+test('ActivityPubSystem - Handle Delete Tombstone activity', async t => {
+  const store = newStore()
+  const mockFetch = new MockFetch()
+  const hookSystem = new HookSystem(store, mockFetch.fetch as FetchLike)
+  const moderation = new ModerationChecker(store)
+  const aps = new ActivityPubSystem(
+    'http://localhost',
+    store,
+    moderation,
+    hookSystem,
+    mockLog,
+    mockFetch.fetch as FetchLike
+  )
+
+  const actorMention = '@[email protected]'
+  const activityId = 'https://example.com/activity1'
+
+  const actorUrl = mockFetch.mockActor(actorMention)
+
+  await store.forActor(actorMention).setInfo({
+    keypair: { ...generateKeypair() },
+    actorUrl,
+    publicKeyId: 'testAccount#main-key'
+  })
+
+  const activity: APActivity = {
+    '@context': 'https://www.w3.org/ns/activitystreams',
+    type: 'Like',
+    published: new Date().toISOString(),
+    actor: actorUrl,
+    object: 'https://example.com/note1',
+    id: activityId
+  }
+  await store.forActor(actorMention).inbox.add(activity)
+
+  const deleteActivity: APActivity = {
+    '@context': 'https://www.w3.org/ns/activitystreams',
+    type: 'Delete',
+    published: new Date().toISOString(),
+    actor: actorUrl,
+    object: {
+      id: activityId,
+      type: 'Tombstone'
+    },
+    id: 'https://example.com/activity2'
+  }
+
+  mockFetch.addAPObject(deleteActivity)
+
+  await aps.ingestActivity(actorMention, deleteActivity)
+
+  try {
+    await store.forActor(actorMention).inbox.get(activityId)
+    t.fail('The activity should be deleted from the inbox')
+  } catch (error) {
+    if (error instanceof Error) {
+      t.true(error.message.includes('Activity not found'), 'The activity should be deleted from the inbox')
+    } else {
+      t.fail('Unexpected error type')
+    }
+  }
+
+  const storedActivities = await store.forActor(actorMention).inbox.list({ object: activityId })
+  const isActivityPresent = storedActivities.some((a) => a.id === activityId)
+  t.falsy(isActivityPresent, 'The activity should be removed from the index/collection')
+})
+
 // After all tests, restore all sinon mocks
 test.afterEach(() => {
   // Restore all sinon mocks

src/server/apsystem.ts

@@ -539,12 +539,20 @@ export default class ActivityPubSystem {
         )
         return
       }
+
       // Remove activity from inbox and any other index/collection
-      if (typeof activity.object !== 'string') {
-        throw createError(400, 'Error deleting activity, must have activity URL in object field')
+      let object = activity.object
+      if (typeof object !== 'string') {
+        if ((object != null) && 'id' in object && typeof object.id === 'string') {
+          object = object.id
+        } else {
+          this.log.warn({ activity }, 'Error deleting activity, must have activity URL in object field')
+          throw createError(400, 'Error deleting activity, must have activity URL in object field')
+        }
       }
-      await actorStore.inbox.remove(activity.object)
-      this.log.info({ activityId }, 'Deleted activity from inbox')
+
+      await actorStore.inbox.remove(object)
+      this.log.info({ activityId, object }, 'Deleted activity from inbox')
       // Notify CMS that the activity was deleted
       await this.hookSystem.dispatchOnApproved(fromActor, activity)
       return