@evanp/activitypub-bot 0.48.2 → 0.49.1

package/CHANGELOG.md

@@ -9,6 +9,16 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [0.49.1] - 2026-06-28
+
+### Added
+
+- Log subject in inbox and shared inbox
+
+## [0.49.0] - 2026-06-28
+
+- New forceUnsubscribe argument for MastodonRelayClient, to force it
+  to unsubscribe unconditionally to an array of actors.
 - Missing required `instance` property in /nodeinfo/2.2.
 
 ## [0.48.2] - 2026-06-04

package/lib/botcontext.js

@@ -33,6 +33,10 @@ export class BotContext {
     return this.#botId
   }
 
+  get botActorId () {
+    return this.#formatter.format({ username: this.#botId })
+  }
+
   get logger () {
     return this.#logger
   }

package/lib/bots/mastodonrelayclient.js

@@ -10,7 +10,7 @@ const ANNOUNCE = `${NS}Announce`
 export default class MastodonRelayClientBot extends Bot {
   #relay
   #relayForwarding
-
+  #forceUnsubscribe
   constructor (username, options = {}) {
     if (typeof username !== 'string') {
       throw new Error('username must be a string')
@@ -29,6 +29,16 @@ export default class MastodonRelayClientBot extends Bot {
     this.#relayForwarding = ('relayForwarding' in options)
       ? options.relayForwarding
       : true
+    if (options.forceUnsubscribe) {
+      if (!Array.isArray(options.forceUnsubscribe)) {
+        throw new Error('forceUnsubscribe option must be an array')
+      }
+      const fus = new Set(options.forceUnsubscribe)
+      if (this.#relay.some(x => fus.has(x))) {
+        throw new Error('forceUnsubscribe option must not overlap with relay option')
+      }
+    }
+    this.#forceUnsubscribe = options.forceUnsubscribe || []
   }
 
   get type () {
@@ -50,6 +60,22 @@ export default class MastodonRelayClientBot extends Bot {
       'Initialising relay client'
     )
 
+    assert.ok(Array.isArray(this.#forceUnsubscribe))
+
+    for (const id of this.#forceUnsubscribe) {
+      const actor = await this._context.getObject(id)
+      if (actor) {
+        try {
+          await this.#unfollowRelay(actor)
+        } catch (err) {
+          this._context.logger.warn(
+            { err, actorId: id },
+            'Error unfollowing actor; skipping'
+          )
+        }
+      }
+    }
+
     assert.ok(Array.isArray(this.#relay))
 
     const toFollow = new Set(this.#relay)
@@ -107,20 +133,36 @@ export default class MastodonRelayClientBot extends Bot {
   }
 
   async #unfollowRelay (actor) {
-    const activityId = await this.#getFollowActivity(actor)
     this._context.logger.info(
-      { relay: actor.id, activity: activityId },
+      { relay: actor.id },
       'Unfollowing relay'
     )
-    await this._context.doActivity({
+    let activityId
+    try {
+      activityId = await this.#getFollowActivity(actor)
+      this._context.logger.info(
+        { relay: actor.id, activityId },
+        'Follow activity found when unfollowing relay'
+      )
+    } catch (err) {
+      this._context.logger.warn(
+        { relay: actor.id },
+        'No follow activity found when unfollowing relay'
+      )
+    }
+    const undo = {
       to: actor.id,
       type: 'Undo',
       object: {
-        id: activityId,
         type: 'Follow',
+        actor: this._context.botActorId,
         object: 'https://www.w3.org/ns/activitystreams#Public'
       }
-    })
+    }
+    if (activityId) {
+      undo.object.id = activityId
+    }
+    await this._context.doActivity(undo)
     this._context.logger.info(
       { relay: actor.id },
       'Clearing follow data'

package/lib/routes/inbox.js

@@ -75,7 +75,7 @@ router.post('/user/:username/inbox', async (req, res, next) => {
   }
 
   logger.info(
-    { reqId: req.id, activity: activity.id, bot: bot.username },
+    { reqId: req.id, activity: activity.id, bot: bot.username, subject },
     'Activity received at bot inbox'
   )
 

package/lib/routes/sharedinbox.js

@@ -72,7 +72,7 @@ router.post('/shared/inbox', async (req, res, next) => {
   }
 
   logger.info(
-    { reqId: req.id, activity: activity.id },
+    { reqId: req.id, activity: activity.id, subject },
     'Activity received at shared inbox'
   )
 

package/package.json

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