@evanp/activitypub-bot 0.24.0 → 0.24.2

package/lib/activitypubclient.js

@@ -102,7 +102,9 @@ export class ActivityPubClient {
     assert.equal(typeof obj, 'object')
     assert.ok(username)
     assert.equal(typeof username, 'string')
-    const body = await obj.write()
+    const json = await obj.export()
+    this.#fixupJson(json)
+    const body = JSON.stringify(json)
     const headers = {
       date: new Date().toUTCString(),
       'user-agent': ActivityPubClient.#userAgent,
@@ -174,4 +176,30 @@ export class ActivityPubClient {
       }
     }
   }
+
+  #fixupJson (json) {
+    this.#fixupRelayFollow(json)
+    this.#fixupRelayUndoFollow(json)
+  }
+
+  #fixupRelayFollow (json) {
+    if (typeof json.type === 'string' &&
+      json.type === 'Follow' &&
+      typeof json.object === 'string' &&
+      json.object === 'as:Public') {
+      json.object = 'https://www.w3.org/ns/activitystreams#Public'
+    }
+  }
+
+  #fixupRelayUndoFollow (json) {
+    if (typeof json.type === 'string' &&
+      json.type === 'Undo' &&
+      typeof json.object === 'object' &&
+      typeof json.object.type === 'string' &&
+      json.object.type === 'Follow' &&
+      typeof json.object.object === 'string' &&
+      json.object.object === 'as:Public') {
+      json.object.object = 'https://www.w3.org/ns/activitystreams#Public'
+    }
+  }
 }

package/lib/bots/relayclient.js

@@ -1,5 +1,9 @@
 import Bot from '../bot.js'
 
+const NS = 'https://www.w3.org/ns/activitystreams#'
+const ACCEPT = `${NS}Accept`
+const REJECT = `${NS}Reject`
+
 export default class RelayClientBot extends Bot {
   #relay
   #unsubscribe
@@ -20,7 +24,7 @@ export default class RelayClientBot extends Bot {
 
   async initialize (context) {
     super.initialize(context)
-    this._context.logger.debug(
+    this._context.logger.info(
       { relay: this.#relay, unsubscribe: this.#unsubscribe },
       'Initialising relay client'
     )
@@ -35,8 +39,25 @@ export default class RelayClientBot extends Bot {
     }
   }
 
-  async #followRelay () {
+  async handleActivity (activity) {
     this._context.logger.debug(
+      'handling activity'
+    )
+    if (activity.type === ACCEPT) {
+      return await this.#handleAccept(activity)
+    } else if (activity.type === REJECT) {
+      return await this.#handleReject(activity)
+    } else {
+      return false
+    }
+  }
+
+  async actorOK (actorId, activity) {
+    return (actorId === this.#relay && !this.#unsubscribe)
+  }
+
+  async #followRelay () {
+    this._context.logger.info(
       { relay: this.#relay },
       'Following relay'
     )
@@ -45,7 +66,7 @@ export default class RelayClientBot extends Bot {
       type: 'Follow',
       object: 'https://www.w3.org/ns/activitystreams#Public'
     })
-    this._context.logger.debug(
+    this._context.logger.info(
       { relay: this.#relay, activity: activity.id },
       'Saving follow for later'
     )
@@ -54,7 +75,7 @@ export default class RelayClientBot extends Bot {
 
   async #unfollowRelay () {
     const activityId = await this._context.getData(`follow:${this.#relay}`)
-    this._context.logger.debug(
+    this._context.logger.info(
       { relay: this.#relay, activity: activityId },
       'Unfollowing relay'
     )
@@ -67,14 +88,36 @@ export default class RelayClientBot extends Bot {
         object: 'https://www.w3.org/ns/activitystreams#Public'
       }
     })
-    this._context.logger.debug(
+    this._context.logger.info(
       { relay: this.#relay },
       'Clearing follow data'
     )
     this._context.setData(`follow:${this.#relay}`, null)
   }
 
-  async actorOK (actorId, activity) {
-    return (actorId === this.#relay && !this.#unsubscribe)
+  async #handleAccept (activity) {
+    const activityId = await this._context.getData(`follow:${this.#relay}`)
+    if (activity.object?.first?.id === activityId) {
+      this._context.logger.info(
+        { accept: activity.id, follow: activityId },
+        'Follow accepted'
+      )
+      return true
+    } else {
+      return false
+    }
+  }
+
+  async #handleReject (activity) {
+    const activityId = await this._context.getData(`follow:${this.#relay}`)
+    if (activity.object?.first?.id === activityId) {
+      this._context.logger.info(
+        { accept: activity.id, follow: activityId },
+        'Follow rejected'
+      )
+      return true
+    } else {
+      return false
+    }
   }
 }

package/package.json

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