@evanp/activitypub-bot 0.45.4 → 0.45.6

package/CHANGELOG.md

@@ -9,6 +9,21 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [0.45.6] - 2026-04-27
+
+### Fixed
+
+- Patch up database problem where actors are
+  stored in `pendingFollowing` instead of
+  `Follow` activities.
+
+## [0.45.5] - 2026-04-27
+
+### Fixed
+
+- Clear stale follow requests in followback bot
+- Synchronize followers collection in followback bot
+
 ## [0.45.4] - 2026-04-26
 
 ### Fixed

package/lib/botcontext.js

@@ -278,6 +278,15 @@ export class BotContext {
         'pendingFollowing',
         followActivity
       )
+      // Buggy code used to put the actor in
+      // the collection
+      if (await this.#actorStorage.isInCollection(this.#botId, 'pendingFollowing', actor)) {
+        await this.#actorStorage.removeFromCollection(
+          this.#botId,
+          'pendingFollowing',
+          actor
+        )
+      }
     }
     await this.#actorStorage.removeFromCollection(
       this.#botId,
@@ -487,6 +496,10 @@ export class BotContext {
     yield * this.#actorStorage.items(this.#botId, 'following')
   }
 
+  async * pendingFollowing () {
+    yield * this.#actorStorage.items(this.#botId, 'pendingFollowing')
+  }
+
   async addFollowingUnsafe (actor) {
     assert.ok(actor)
     assert.equal(typeof actor, 'object')

package/lib/bots/followback.js

@@ -3,14 +3,33 @@ import Bot from '../bot.js'
 const DEFAULT_NAME = 'FollowBackBot'
 const DEFAULT_DESCRIPTION = 'A bot that follows you back'
 
+const NS = 'https://www.w3.org/ns/activitystreams#'
+const FOLLOW = `${NS}Follow`
+
+// 7-day default timeout
+
+const DEFAULT_STALE_FOLLOW_TIMEOUT = 7 * 24 * 60 * 60 * 1000
+
 export default class FollowBackBot extends Bot {
   #fullname
   #description
+  #staleFollowTimeout
 
   constructor (username, options = {}) {
     super(username, options)
     this.#fullname = options.fullname || DEFAULT_NAME
     this.#description = options.description || DEFAULT_DESCRIPTION
+    this.#staleFollowTimeout = ('staleFollowTimeout' in options)
+      ? options.staleFollowTimeout
+      : DEFAULT_STALE_FOLLOW_TIMEOUT
+  }
+
+  async initialize (context) {
+    await super.initialize(context)
+    await this.#undoStalePendingFollowing()
+    // Drain the queue so undos arrive before re-follows
+    await this._context.onIdle()
+    await this.#synchronizeFollowers()
   }
 
   get fullname () {
@@ -30,4 +49,67 @@ export default class FollowBackBot extends Bot {
     this._context.logger.info({ actorId: actor.id }, 'Unfollowing user back')
     await this._context.unfollowActor(actor)
   }
+
+  async #synchronizeFollowers () {
+    for await (const follower of this._context.followers()) {
+      try {
+        if (!await this._context.isFollowing(follower) &&
+          !await this._context.isPendingFollowing(follower)) {
+          await this._context.followActor(follower)
+          this._context.logger.info(
+            {
+              actorId: follower.id
+            },
+            'Synchronized a follower not yet followed'
+          )
+        }
+      } catch (err) {
+        this._context.logger.error(
+          {
+            err,
+            follower: follower.id
+          },
+          'Error checking for followback; skipping'
+        )
+      }
+    }
+  }
+
+  async #undoStalePendingFollowing () {
+    const now = new Date()
+    for await (const follow of this._context.pendingFollowing()) {
+      try {
+        const activity = await this._context.getObject(follow.id)
+        if (activity.type === FOLLOW) {
+          if (activity.published && (now - activity.published > this.#staleFollowTimeout)) {
+            await this._context.unfollowActor(activity.object.first)
+            this._context.logger.info(
+              {
+                actorId: activity.object.first?.id,
+                published: activity.published
+              },
+              'Unfollowed stale actor'
+            )
+          }
+        } else if (activity.inbox) {
+          const actor = activity
+          this._context.logger.warn(
+            {
+              actorId: actor.id
+            },
+            'actor incorrectly in pendingFollowing'
+          )
+          await this._context.unfollowActor(actor)
+        }
+      } catch (err) {
+        this._context.logger.error(
+          {
+            err,
+            activity: follow.id
+          },
+          'Error checking stale follow; skipping'
+        )
+      }
+    }
+  }
 }

package/package.json

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