@evanp/activitypub-bot 0.33.0 → 0.34.1

package/lib/activitydeliverer.js

@@ -160,6 +160,20 @@ export class ActivityDeliverer {
         }
       }
     }
+
+    switch (activity.type) {
+      case `${NS}Follow`:
+        await this.#deliverFollowToAll(activity, bots, deliveredTo)
+        break
+    }
+  }
+
+  async #deliverFollowToAll (activity, bots, deliveredTo) {
+    const object = activity.object?.first
+    if (object?.id && this.#isLocal(object) && !deliveredTo.has(this.#formatter.unformat(object.id).username)) {
+      this.#logger.debug({ object: object.id, activity: activity.id }, 'Follow not yet delivered to object, delivering now')
+      await this.#deliverLocalActor(activity, object, bots, deliveredTo)
+    }
   }
 
   async #isRemoteFollowersCollection (actor, object) {

package/lib/activityhandler.js

@@ -634,16 +634,15 @@ export class ActivityHandler {
         'following',
         actor
       )
-      await this.#actorStorage.removeFromCollection(
-        bot.username,
-        'pendingFollowing',
-        actor
-      )
-      await this.#actorStorage.removeFromCollection(
-        bot.username,
-        'pendingFollowers',
-        actor
-      )
+      const followId = await this.#actorStorage.getLastActivity(bot.username, 'Follow', actor)
+      if (followId) {
+        const followActivity = await this.#objectStorage.read(followId)
+        await this.#actorStorage.removeFromCollection(
+          bot.username,
+          'pendingFollowing',
+          followActivity
+        )
+      }
     }
   }
 
@@ -829,11 +828,9 @@ export class ActivityHandler {
       })
       return
     }
-    if (
-      !(await this.#actorStorage.isInCollection(bot.username, 'followers', actor)) &&
-      !(await this.#actorStorage.isInCollection(bot.username, 'pendingFollowers', actor))) {
+    if (!(await this.#actorStorage.isInCollection(bot.username, 'followers', actor))) {
       this.#logger.warn({
-        msg: 'Undo follow activity from actor not in followers or pendingFollowers',
+        msg: 'Undo follow activity from actor not in followers',
         activity: undoActivity.id,
         followActivity: followActivity.id,
         actor: actor.id
@@ -841,7 +838,6 @@ export class ActivityHandler {
       return
     }
     await this.#actorStorage.removeFromCollection(bot.username, 'followers', actor)
-    await this.#actorStorage.removeFromCollection(bot.username, 'pendingFollowers', actor)
     this.#logger.debug(
       { bot: this.#botId(bot), activity: undoActivity.id },
       'Notifying bot of undo follow activity'

package/lib/botcontext.js

@@ -227,8 +227,7 @@ export class BotContext {
     assert.ok(actor)
     assert.equal(typeof actor, 'object')
     let activity
-    if (await this.#actorStorage.isInCollection(this.#botId, 'following', actor) ||
-        await this.#actorStorage.isInCollection(this.#botId, 'pendingFollowing', actor)) {
+    if (await this.#actorStorage.isInCollection(this.#botId, 'following', actor)) {
       const originalId = await this.#actorStorage.getLastActivity(
         this.#botId,
         'Follow',
@@ -239,17 +238,24 @@ export class BotContext {
       }
       activity = await this.#objectStorage.read(originalId)
     } else {
-      await this.#actorStorage.addToCollection(
-        this.#botId,
-        'pendingFollowing',
-        actor
-      )
+      const pendingId = await this.#actorStorage.getLastActivity(this.#botId, 'Follow', actor)
+      if (pendingId) {
+        const pendingActivity = await this.#objectStorage.read(pendingId)
+        if (await this.#actorStorage.isInCollection(this.#botId, 'pendingFollowing', pendingActivity)) {
+          return pendingActivity
+        }
+      }
       activity = await this.#doActivity({
         type: 'Follow',
         object: actor.id,
         to: actor.id
       })
       await this.#actorStorage.setLastActivity(this.#botId, activity)
+      await this.#actorStorage.addToCollection(
+        this.#botId,
+        'pendingFollowing',
+        activity
+      )
     }
 
     return activity
@@ -258,11 +264,15 @@ export class BotContext {
   async unfollowActor (actor) {
     assert.ok(actor)
     assert.equal(typeof actor, 'object')
-    await this.#actorStorage.removeFromCollection(
-      this.#botId,
-      'pendingFollowing',
-      actor
-    )
+    const followId = await this.#actorStorage.getLastActivity(this.#botId, 'Follow', actor)
+    if (followId) {
+      const followActivity = await this.#objectStorage.read(followId)
+      await this.#actorStorage.removeFromCollection(
+        this.#botId,
+        'pendingFollowing',
+        followActivity
+      )
+    }
     await this.#actorStorage.removeFromCollection(
       this.#botId,
       'following',
@@ -275,11 +285,14 @@ export class BotContext {
     assert.ok(actor)
     assert.equal(typeof actor, 'object')
     await this.#actorStorage.addToCollection(this.#botId, 'blocked', actor)
+    const followId = await this.#actorStorage.getLastActivity(this.#botId, 'Follow', actor)
+    if (followId) {
+      const followActivity = await this.#objectStorage.read(followId)
+      await this.#actorStorage.removeFromCollection(this.#botId, 'pendingFollowing', followActivity)
+    }
     for (const coll of [
       'following',
-      'followers',
-      'pendingFollowing',
-      'pendingFollowers'
+      'followers'
     ]) {
       await this.#actorStorage.removeFromCollection(this.#botId, coll, actor)
     }

package/lib/ratelimiter.js

@@ -55,7 +55,38 @@ export class RateLimiter {
             updated_at = CURRENT_TIMESTAMP`,
         { replacements: [host, remaining, reset] }
       )
+    } else if (headers.get('server') === 'Mastodon') {
+      const limits = await this.peek(host)
+      if (!limits || limits.length === 0 || limits[0].reset < (new Date())) {
+        const remaining = 299 // 300 - 1 for the current request
+        const reset = new Date(Math.ceil(Date.now() / 300000) * 300000)
+        this.#logger.debug({ reset, remaining, host }, 'updating')
+        await this.#connection.query(
+        `INSERT INTO rate_limit (host, remaining, reset)
+        VALUES (?, ?, ?)
+        ON CONFLICT (host) DO UPDATE
+        SET remaining = EXCLUDED.remaining,
+            reset = EXCLUDED.reset,
+            updated_at = CURRENT_TIMESTAMP`,
+        { replacements: [host, remaining, reset] }
+        )
+      }
+    }
+  }
+
+  async peek (host) {
+    const [result] = await this.#connection.query(
+      'SELECT remaining, reset FROM rate_limit WHERE host = ?',
+      { replacements: [host] }
+    )
+
+    if (result.length === 0) {
+      return []
     }
+
+    const { remaining, reset } = result[0]
+
+    return [{ policy: 'default', remaining, reset: new Date(reset) }]
   }
 
   async #getWaitTime (host, maxWaitTime) {

package/package.json

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