@evanp/activitypub-bot 0.14.0 → 0.14.2

package/lib/activityhandler.js

@@ -479,13 +479,17 @@ export class ActivityHandler {
     await this.#objectStorage.addToCollection(object.id, 'likers', actor)
     const recipients = this.#getRecipients(object)
     this.#addRecipient(recipients, actor, 'to')
+    const parts = this.#formatter.unformat(object.id)
+    const likesCollectionId = this.#formatter.format({
+      username: parts.username,
+      type: parts.type,
+      nanoid: parts.nanoid,
+      collection: 'likes'
+    })
     await this.#doActivity(bot, {
       type: 'Add',
       object: activity,
-      target: this.#formatter.format({
-        username: bot.username,
-        collection: 'likes'
-      }),
+      target: likesCollectionId,
       ...recipients
     })
     await bot.onLike(object, activity)
@@ -550,13 +554,17 @@ export class ActivityHandler {
     await this.#objectStorage.addToCollection(object.id, 'sharers', actor)
     const recipients = this.#getRecipients(object)
     this.#addRecipient(recipients, actor, 'to')
+    const parts = this.#formatter.unformat(object.id)
+    const sharesCollectionId = this.#formatter.format({
+      username: parts.username,
+      type: parts.type,
+      nanoid: parts.nanoid,
+      collection: 'shares'
+    })
     await this.#doActivity(bot, {
       type: 'Add',
       object: activity,
-      target: this.#formatter.format({
-        username: bot.username,
-        collection: 'shares'
-      }),
+      target: sharesCollectionId,
       ...recipients
     })
     try {
@@ -840,7 +848,11 @@ export class ActivityHandler {
     const activity = await as2.import({
       ...activityData,
       id: this.#formatActivityId(bot, activityData.type),
-      actor: await this.#botActor(bot),
+      actor: {
+        id: this.#botId(bot),
+        name: bot.fullname,
+        type: 'Service'
+      },
       published: now,
       updated: now
     })
@@ -948,7 +960,9 @@ export class ActivityHandler {
 
   async #botActor (bot) {
     return await as2.import({
-      id: this.#formatter.format({ username: bot.username })
+      id: this.#formatter.format({ username: bot.username }),
+      name: bot.fullname,
+      type: 'Service'
     })
   }
 

package/lib/authorizer.js

@@ -92,11 +92,11 @@ export class Authorizer {
   }
 
   async #getOwner (object) {
-    if (object.attributedTo) {
+    if (object.attributedTo && object.attributedTo.first) {
       return object.attributedTo.first
-    } else if (object.actor) {
+    } else if (object.actor && object.actor.first) {
       return object.actor.first
-    } else if (object.owner) {
+    } else if (object.owner && object.owner.first) {
       return object.owner.first
     } else if (this.#formatter.isLocal(object.id)) {
       const parts = this.#formatter.unformat(object.id)

package/lib/routes/collection.js

@@ -85,7 +85,17 @@ function collectionPageHandler (collection) {
             return false
           }
           req.log.debug({ id, object }, 'loaded object')
-          return await authorizer.canRead(remote, object)
+          let result = false
+          try {
+            result = await authorizer.canRead(remote, object)
+          } catch (err) {
+            req.log.debug(
+              { err, remote: remote.id, object: object.id },
+              `Error checking read access`
+            )
+            result = false
+          }
+          return result
         })
       }
     } catch (error) {

package/package.json

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