@evanp/activitypub-bot 0.13.7 → 0.13.10

package/lib/activityhandler.js

@@ -58,16 +58,16 @@ export class ActivityHandler {
     const actor = this.#getActor(activity)
     if (!actor) {
       this.#logger.warn(
-        'Create activity has no actor',
-        { activity: activity.id }
+        { activity: activity.id },
+        'Create activity has no actor'
       )
       return
     }
     const object = this.#getObject(activity)
     if (!object) {
       this.#logger.warn(
-        'Create activity has no object',
-        { activity: activity.id }
+        { activity: activity.id },
+        'Create activity has no object'
       )
       return
     }
@@ -79,6 +79,10 @@ export class ActivityHandler {
     await this.#handleCreateReplies(bot, activity, actor, object)
     await this.#handleCreateThread(bot, activity, actor, object)
     if (this.#isMention(bot, object)) {
+      this.#logger.debug(
+         { username: bot.username, object: object.id },
+        'bot mentioned'
+      )
       await bot.onMention(object, activity)
     }
   }

package/lib/bots/ok.js

@@ -10,13 +10,30 @@ export default class OKBot extends Bot {
   }
 
   async onMention (object, activity) {
+    this._context.logger.debug(
+      { object: object.id, activity: activity.id },
+      'bot mentioned'
+    )
     if (!await this.hasSeen(object)) {
+      this._context.logger.debug(
+        { object: object.id },
+        'not previously seen'
+      )
       const attributedTo =
         object.attributedTo?.first.id ||
         activity.actor?.first.id
+      this._context.logger.debug(
+        { object: object.id, attributedTo: attributedTo },
+        'attributed to'
+      )
       const wf = await this._context.toWebfinger(attributedTo)
-      this._context.logger.info({ object: object.id, attributedTo, wf }, 'received mention')
       const content = (wf) ? `@${wf} OK` : 'OK'
+      this._context.logger.info({
+        object: object.id,
+        attributedTo,
+        wf,
+        content
+      }, 'sending reply')
       const reply = await this._context.sendReply(content, object)
       this._context.logger.info({
         reply: reply.id,

package/lib/keystorage.js

@@ -50,7 +50,8 @@ export class KeyStorage {
         'found key for bot in database')
       publicKey = result[0].public_key
       privateKey = result[0].private_key
-    } else {
+    }
+    if (!publicKey || !privateKey) {
       this.#logger.debug(
         { username, method: 'KeyStorage.#getKeys' },
         'no key for bot, generating new key'
@@ -62,11 +63,13 @@ export class KeyStorage {
       )
       await this.#saveKeyPair(username, publicKey, privateKey)
     }
+    const publicKeyHash = publicKey ? this.#hasher.humanize(publicKey) : null
+    const privateKeyHash = privateKey ? this.#hasher.humanize(privateKey) : null
     this.#logger.debug({
       username,
       method: 'KeyStorage.#getKeys',
-      publicKeyHash: this.#hasher.humanize(publicKey),
-      privateKeyHash: this.#hasher.humanize(privateKey)
+      publicKeyHash,
+      privateKeyHash
     })
     return [publicKey, privateKey]
   }
@@ -91,7 +94,11 @@ export class KeyStorage {
 
   async #saveKeyPair (username, publicKey, privateKey) {
     await this.#connection.query(`
-        INSERT INTO new_keys (username, public_key, private_key) VALUES (?, ?, ?)
+        INSERT INTO new_keys (username, public_key, private_key)
+        VALUES (?, ?, ?)
+        ON CONFLICT(username) DO UPDATE SET
+          public_key = excluded.public_key,
+          private_key = excluded.private_key
       `, { replacements: [username, publicKey, privateKey] })
   }
 }

package/package.json

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