@evanp/activitypub-bot 0.13.12 → 0.13.13

package/lib/activityhandler.js

@@ -129,18 +129,12 @@ export class ActivityHandler {
         )
         const recipients = this.#getRecipients(original)
         this.#addRecipient(recipients, actor, 'to')
-        await this.#doActivity(bot, await as2.import({
+        await this.#doActivity(bot, {
           type: 'Add',
-          id: this.#formatter.format({
-            username: bot.username,
-            type: 'add',
-            nanoid: nanoid()
-          }),
-          actor: await this.#botActor(bot),
           object,
           target: original.replies,
           ...recipients
-        }))
+        })
       }
     }
   }
@@ -189,18 +183,12 @@ export class ActivityHandler {
         )
         const recipients = this.#getRecipients(root)
         this.#addRecipient(recipients, actor, 'to')
-        await this.#doActivity(bot, await as2.import({
+        await this.#doActivity(bot, {
           type: 'Add',
-          id: this.#formatter.format({
-            username: bot.username,
-            type: 'add',
-            nanoid: nanoid()
-          }),
-          actor: this.#botActor(bot),
           object,
           target: root.thread,
           ...recipients
-        }))
+        })
       }
     }
   }
@@ -291,33 +279,20 @@ export class ActivityHandler {
       'Sending accept',
       { actor: actor.id }
     )
-    const addActivityId = this.#formatter.format({
-      username: bot.username,
-      type: 'add',
-      nanoid: nanoid()
-    })
-    await this.#doActivity(bot, await as2.import({
-      id: addActivityId,
+    await this.#doActivity(bot, {
       type: 'Add',
-      actor: await this.#botActor(bot),
       object: actor,
       target: this.#formatter.format({
         username: bot.username,
         collection: 'followers'
       }),
       to: ['as:Public', actor.id]
-    }))
-    await this.#doActivity(bot, await as2.import({
-      id: this.#formatter.format({
-        username: bot.username,
-        type: 'accept',
-        nanoid: nanoid()
-      }),
+    })
+    await this.#doActivity(bot, {
       type: 'Accept',
-      actor: this.#formatter.format({ username: bot.username }),
       object: activity,
       to: actor
-    }))
+    })
     this.#logger.debug({
       msg: 'Notifying bot of new follow',
       actor: actor.id
@@ -379,21 +354,15 @@ export class ActivityHandler {
       'pendingFollowing',
       followActivity
     )
-    await this.#doActivity(bot, await as2.import({
-      id: this.#formatter.format({
-        username: bot.username,
-        type: 'add',
-        nanoid: nanoid()
-      }),
+    await this.#doActivity(bot, {
       type: 'Add',
-      actor: await this.#botActor(bot),
       object: actor,
       target: this.#formatter.format({
         username: bot.username,
         collection: 'following'
       }),
       to: ['as:Public', actor.id]
-    }))
+    })
   }
 
   async #handleReject (bot, activity) {
@@ -510,21 +479,15 @@ export class ActivityHandler {
     await this.#objectStorage.addToCollection(object.id, 'likers', actor)
     const recipients = this.#getRecipients(object)
     this.#addRecipient(recipients, actor, 'to')
-    await this.#doActivity(bot, await as2.import({
+    await this.#doActivity(bot, {
       type: 'Add',
-      id: this.#formatter.format({
-        username: bot.username,
-        type: 'add',
-        nanoid: nanoid()
-      }),
-      actor: await this.#botActor(bot),
       object: activity,
       target: this.#formatter.format({
         username: bot.username,
         collection: 'likes'
       }),
       ...recipients
-    }))
+    })
     await bot.onLike(object, activity)
   }
 
@@ -587,21 +550,15 @@ export class ActivityHandler {
     await this.#objectStorage.addToCollection(object.id, 'sharers', actor)
     const recipients = this.#getRecipients(object)
     this.#addRecipient(recipients, actor, 'to')
-    await this.#doActivity(bot, await as2.import({
+    await this.#doActivity(bot, {
       type: 'Add',
-      id: this.#formatter.format({
-        username: bot.username,
-        type: 'add',
-        nanoid: nanoid()
-      }),
-      actor: await this.#botActor(bot),
       object: activity,
       target: this.#formatter.format({
         username: bot.username,
         collection: 'shares'
       }),
       ...recipients
-    }))
+    })
     try {
       await bot.onAnnounce(object, activity)
     } catch (err) {
@@ -878,13 +835,38 @@ export class ActivityHandler {
     }
   }
 
-  async #doActivity (bot, activity) {
+  async #doActivity (bot, activityData) {
+    const now = new Date().toISOString()
+    const activity = await as2.import({
+      ...activityData,
+      id: this.#formatActivityId(bot, activityData.type),
+      actor: await this.#botActor(bot),
+      published: now,
+      updated: now
+    })
     await this.#objectStorage.create(activity)
     await this.#actorStorage.addToCollection(bot.username, 'outbox', activity)
     await this.#actorStorage.addToCollection(bot.username, 'inbox', activity)
     await this.#distributor.distribute(activity, bot.username)
   }
 
+  #formatActivityId (bot, type) {
+    const typeName = this.#activityTypeName(type)
+    return this.#formatter.format({
+      username: bot.username,
+      type: typeName,
+      nanoid: nanoid()
+    })
+  }
+
+  #activityTypeName (type) {
+    if (!type || typeof type !== 'string') {
+      return 'activity'
+    }
+    const parts = type.split(/[\/#]/)
+    return parts[parts.length - 1].toLowerCase()
+  }
+
   #getActor (activity) {
     return activity.actor?.first
   }

package/lib/authorizer.js

@@ -1,3 +1,5 @@
+import as2 from './activitystreams.js'
+
 export class Authorizer {
   #PUBLIC = 'https://www.w3.org/ns/activitystreams#Public'
   #actorStorage = null
@@ -96,6 +98,11 @@ export class Authorizer {
       return object.actor.first
     } else if (object.owner) {
       return object.owner.first
+    } else if (this.#formatter.isLocal(object.id)) {
+      const parts = this.#formatter.unformat(object.id)
+      return as2.import({
+        id: this.#formatter.format({username: parts.username})
+      })
     } else {
       return null
     }

package/package.json

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