@evanp/activitypub-bot 0.25.0 → 0.26.0

package/lib/botcontext.js

@@ -378,12 +378,18 @@ export class BotContext {
     return `${username}@${actorUrl.hostname}`
   }
 
-  async announceObject (obj) {
+  async announceObject (obj, actors = null) {
     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)
+
+    const owners = (actors)
+      ? Array.from(actors).map(actor => actor.id)
+      : (obj.attributedTo)
+          ? Array.from(obj.attributedTo).map((owner) => owner.id)
+          : (obj.actor)
+              ? Array.from(obj.actor).map((owner) => owner.id)
+              : []
+
     const summary = `${this.#botId} shared "${await this.#nameOf(obj)}"`
     const activity = await this.#doActivity({
       type: 'Announce',
@@ -447,9 +453,9 @@ export class BotContext {
 
   #nameOf (obj) {
     if (obj.name) {
-      return obj.name.valueOf()
+      return obj.name.get()
     } else if (obj.summary) {
-      return obj.summary.valueOf()
+      return obj.summary.get()
     } else if (obj.type) {
       return `a(n) ${obj.type.first}`
     } else {

package/lib/botfactory.js

@@ -21,4 +21,8 @@ export default class BotFactory {
   async onPublic (activity) {
     ; // no-op
   }
+
+  async actorOK (actorId, activity) {
+    return false
+  }
 }

package/lib/bots/relayclient.js

@@ -22,6 +22,10 @@ export default class RelayClientBot extends Bot {
     return 'A bot for subscribing to relays'
   }
 
+  get key () {
+    return `follow:${this.#relay}`
+  }
+
   async initialize (context) {
     super.initialize(context)
     this._context.logger.info(
@@ -29,11 +33,12 @@ export default class RelayClientBot extends Bot {
       'Initialising relay client'
     )
     if (this.#unsubscribe) {
-      if (await this._context.hasData(`follow:${this.#relay}`)) {
+      if (await this._context.hasData(this.key)) {
         await this.#unfollowRelay()
       }
     } else {
-      if (!(await this._context.hasData(`follow:${this.#relay}`))) {
+      if (!(await this._context.hasData(this.key)) ||
+        ((await this._context.getData(this.key)) == null)) {
         await this.#followRelay()
       }
     }
@@ -70,11 +75,11 @@ export default class RelayClientBot extends Bot {
       { relay: this.#relay, activity: activity.id },
       'Saving follow for later'
     )
-    this._context.setData(`follow:${this.#relay}`, activity.id)
+    this._context.setData(this.key, activity.id)
   }
 
   async #unfollowRelay () {
-    const activityId = await this._context.getData(`follow:${this.#relay}`)
+    const activityId = await this._context.getData(this.key)
     this._context.logger.info(
       { relay: this.#relay, activity: activityId },
       'Unfollowing relay'
@@ -92,11 +97,11 @@ export default class RelayClientBot extends Bot {
       { relay: this.#relay },
       'Clearing follow data'
     )
-    this._context.setData(`follow:${this.#relay}`, null)
+    this._context.deleteData(this.key)
   }
 
   async #handleAccept (activity) {
-    const activityId = await this._context.getData(`follow:${this.#relay}`)
+    const activityId = await this._context.getData(this.key)
     if (activity.object?.first?.id === activityId) {
       this._context.logger.info(
         { accept: activity.id, follow: activityId },
@@ -109,7 +114,7 @@ export default class RelayClientBot extends Bot {
   }
 
   async #handleReject (activity) {
-    const activityId = await this._context.getData(`follow:${this.#relay}`)
+    const activityId = await this._context.getData(this.key)
     if (activity.object?.first?.id === activityId) {
       this._context.logger.info(
         { accept: activity.id, follow: activityId },

package/lib/routes/sharedinbox.js

@@ -15,7 +15,10 @@ async function asyncSome (array, asyncPredicate) {
 }
 
 async function actorOK (subject, activity, bots) {
-  await asyncSome(Object.values(bots), bot => bot.actorOK(subject, activity))
+  return await asyncSome(
+    Object.values(bots),
+    bot => bot.actorOK(subject, activity)
+  )
 }
 
 router.post('/shared/inbox', async (req, res, next) => {

package/package.json

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