@evanp/activitypub-bot 0.45.5 → 0.45.6

package/CHANGELOG.md

@@ -9,6 +9,14 @@ 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

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,

package/lib/bots/followback.js

@@ -3,6 +3,9 @@ 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
@@ -77,15 +80,26 @@ export default class FollowBackBot extends Bot {
     for await (const follow of this._context.pendingFollowing()) {
       try {
         const activity = await this._context.getObject(follow.id)
-        if (activity.published && (now - activity.published > this.#staleFollowTimeout)) {
-          await this._context.unfollowActor(activity.object.first)
-          this._context.logger.info(
+        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: activity.object.first?.id,
-              published: activity.published
+              actorId: actor.id
             },
-            'Unfollowed stale actor'
+            'actor incorrectly in pendingFollowing'
           )
+          await this._context.unfollowActor(actor)
         }
       } catch (err) {
         this._context.logger.error(

package/package.json

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