From beb28c9696a23671f5af8da30a9264d9e0b8c6da Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 20 Apr 2023 20:33:19 -0600
Subject: [PATCH] Include message ID in log, fix message

---
 core/servers/content/web_handlers/activitypub.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/servers/content/web_handlers/activitypub.js b/core/servers/content/web_handlers/activitypub.js
index fc9720c2..1add01c0 100644
--- a/core/servers/content/web_handlers/activitypub.js
+++ b/core/servers/content/web_handlers/activitypub.js
@@ -994,7 +994,7 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
                 return cb(err);
             }
 
-            message.persist(err => {
+            message.persist((err, messageId) => {
                 if (!err) {
                     if (_.isObject(localAddressedTo)) {
                         localAddressedTo = localAddressedTo.username;
@@ -1004,8 +1004,9 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
                             localAddressedTo,
                             activityId,
                             noteId: note.id,
+                            messageId,
                         },
-                        'Note delivered as message to private mailbox'
+                        'Note persisted as local Message'
                     );
                 } else if (err.code === 'SQLITE_CONSTRAINT') {
                     return cb(null);