fix(addAsync-thread): ZMSA-2: message addAsync, if a message is referenced then use reference's thread (#889)

* message addAsync, if a message is referenced then use reference's thread

* access referenced message through other object in addAsync, fix if statement

Author: NickOvt

lib/api/messages.js

@@ -2524,7 +2524,8 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
                         .concat('unseen' in result.value ? (result.value.unseen ? [] : '\\Seen') : [])
                         .concat('flagged' in result.value ? (result.value.flagged ? '\\Flagged' : []) : [])
                         .concat('draft' in result.value ? (result.value.draft ? '\\Draft' : []) : []),
-                    raw
+                    raw,
+                    referencedMessage: referencedMessage || false
                 });
                 status = resp.status;
                 messageData = resp.data;

lib/message-handler.js

@@ -606,6 +606,21 @@ class MessageHandler {
             return rollback(err);
         }
 
+        // If referencing a message then use referenced message's thread
+        if (
+            options?.referencedMessage?.thread &&
+            ['reply', 'replyAll'].includes(options?.meta?.reference?.action) &&
+            this.normalizeSubject(subject, {
+                removePrefix: true
+            }) ===
+                this.normalizeSubject(options?.referencedMessage?.subject || '', {
+                    removePrefix: true
+                }) &&
+            thread !== options.referencedMessage.thread
+        ) {
+            thread = options.referencedMessage.thread;
+        }
+
         messageData.thread = thread;
 
         let insertRes;