@evanp/activitypub-bot 0.16.3 → 0.16.5

package/lib/app.js

@@ -82,10 +82,11 @@ export async function makeApp (databaseUrl, origin, bots, logLevel = 'silent') {
 
   // TODO: Make an endpoint for tagged objects
   const transformer = new Transformer(origin + '/tag/', client)
+
   await Promise.all(
-    Object.values(bots).map(bot => bot.initialize(
+    Object.entries(bots).map(([key, bot]) => bot.initialize(
       new BotContext(
-        bot.username,
+        key,
         botDataStorage,
         objectStorage,
         actorStorage,

package/lib/botcontext.js

@@ -214,27 +214,11 @@ export class BotContext {
   async unlikeObject (obj) {
     assert.ok(obj)
     assert.equal(typeof obj, 'object')
-    const owners = obj.attributedTo
-      ? Array.from(obj.attributedTo).map((owner) => owner.id)
-      : Array.from(obj.actor).map((owner) => owner.id)
     if (!(await this.#actorStorage.isInCollection(this.#botId, 'liked', obj))) {
       throw new Error(`not already liked: ${obj.id} by ${this.#botId}`)
     }
-    const likeActivity = this.#actorStorage.getLastActivity(
-      this.#botId,
-      'Like',
-      obj
-    )
-    if (!likeActivity) {
-      throw new Error('no like activity')
-    }
     await this.#actorStorage.removeFromCollection(this.#botId, 'liked', obj)
-    return await this.#doActivity({
-      type: 'Undo',
-      object: likeActivity,
-      to: owners,
-      cc: 'https://www.w3.org/ns/activitystreams#Public'
-    })
+    return await this.#undoActivity('Like', obj)
   }
 
   async followActor (actor) {
@@ -257,14 +241,6 @@ export class BotContext {
   async unfollowActor (actor) {
     assert.ok(actor)
     assert.equal(typeof actor, 'object')
-    const followActivity = this.#actorStorage.getLastActivity(
-      this.#botId,
-      'Follow',
-      actor
-    )
-    if (!followActivity) {
-      throw new Error('no follow activity')
-    }
     await this.#actorStorage.removeFromCollection(
       this.#botId,
       'pendingFollowing',
@@ -275,11 +251,7 @@ export class BotContext {
       'following',
       actor
     )
-    return await this.#doActivity({
-      type: 'Undo',
-      object: followActivity,
-      to: actor.id
-    })
+    return await this.#undoActivity('Follow', actor)
   }
 
   async blockActor (actor) {
@@ -305,23 +277,8 @@ export class BotContext {
   async unblockActor (actor) {
     assert.ok(actor)
     assert.equal(typeof actor, 'object')
-    const blockActivity = this.#actorStorage.getLastActivity(
-      this.#botId,
-      'Block',
-      actor
-    )
-    if (!blockActivity) {
-      throw new Error('no block activity')
-    }
-    await this.#actorStorage.removeFromCollection(
-      this.#botId,
-      'blocked',
-      actor
-    )
-    return await this.#doActivity({
-      type: 'Undo',
-      object: blockActivity
-    }, false)
+    await this.#actorStorage.removeFromCollection(this.#botId, 'blocked', actor)
+    return await this.#undoActivity('Block', actor, false)
   }
 
   async updateNote (note, content) {
@@ -434,23 +391,7 @@ export class BotContext {
   async unannounceObject (obj) {
     assert.ok(obj)
     assert.equal(typeof obj, 'object')
-    const announceActivity = await this.#actorStorage.getLastActivity(
-      this.#botId,
-      'Announce',
-      obj
-    )
-    if (!announceActivity) {
-      throw new Error(`No matching announce activity for ${obj.id}`)
-    }
-    const recipients = this.#getRecipients(announceActivity)
-    return await this.#doActivity({
-      type: 'Undo',
-      summary: {
-        en: `${this.#botId} shared "${await this.#nameOf(obj)}"`
-      },
-      object: announceActivity,
-      ...recipients
-    })
+    return await this.#undoActivity('Announce', obj)
   }
 
   async #findInOutbox (type, obj) {
@@ -469,6 +410,8 @@ export class BotContext {
   }
 
   #getRecipients (obj) {
+    assert.ok(obj)
+    assert.strictEqual(typeof obj, 'object', 'obj must be an object')
     const to = obj.to ? Array.from(obj.to).map((to) => to.id) : null
     const cc = obj.cc ? Array.from(obj.cc).map((cc) => cc.id) : null
     const bto = obj.bto ? Array.from(obj.bto).map((bto) => bto.id) : null
@@ -518,6 +461,25 @@ export class BotContext {
     return activity
   }
 
+  async #undoActivity (type, obj, distribute = true) {
+    const originalId = await this.#actorStorage.getLastActivity(
+      this.#botId,
+      type,
+      obj
+    )
+    if (!originalId) {
+      throw new Error(`no ${type} activity for ${obj.id}`)
+    }
+    const originalActivity = await this.#objectStorage.read(originalId)
+    assert.ok(originalActivity)
+    const recipients = this.#getRecipients(originalActivity)
+    return await this.#doActivity({
+      type: 'Undo',
+      object: originalId,
+      ...recipients
+    }, distribute)
+  }
+
   async onIdle () {
     await this.#distributor.onIdle()
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evanp/activitypub-bot",
-  "version": "0.16.3",
+  "version": "0.16.5",
   "description": "server-side ActivityPub bot framework",
   "type": "module",
   "main": "lib/index.js",