@evanp/activitypub-bot 0.28.3 → 0.28.4

package/lib/activitypubclient.js

@@ -105,7 +105,10 @@ export class ActivityPubClient {
     }
     const json = await res.json()
     const obj = await as2.import(json)
-    return obj
+    const resolved = (URL.parse(url).hash)
+      ? this.#resolveObject(obj, url)
+      : obj
+    return resolved
   }
 
   async post (url, obj, username) {
@@ -220,4 +223,37 @@ export class ActivityPubClient {
       json.object.object = 'https://www.w3.org/ns/activitystreams#Public'
     }
   }
+
+  #resolveObject (obj, url, visited = new Set()) {
+    if (obj.id && obj.id === url) {
+      return obj
+    }
+
+    if (obj.id) {
+      if (visited.has(obj.id)) {
+        return null
+      }
+      visited.add(obj.id)
+    }
+
+    for (const key of obj) {
+      if (key === '@type' || key === '@id') continue
+
+      const val = obj.get(key)
+
+      if (val == null || typeof val[Symbol.iterator] !== 'function') {
+        continue
+      }
+
+      for (const item of val) {
+        if (item instanceof as2.models.Base) {
+          const found = this.#resolveObject(item, url, visited)
+          if (found) {
+            return found
+          }
+        }
+      }
+    }
+    return null
+  }
 }

package/package.json

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