From 8ff3925f916387e13b64f04273cc35dbb92a24cb Mon Sep 17 00:00:00 2001
From: jissepo <jissepo@users.noreply.github.com>
Date: Mon, 17 Feb 2025 10:15:34 +0200
Subject: [PATCH] Added thread data to FETCH command (#785)

---
 lib/api/messages.js      | 1 +
 lib/api/submit.js        | 1 +
 lib/handlers/on-fetch.js | 1 +
 lib/handlers/on-store.js | 1 +
 lib/message-handler.js   | 1 +
 pop3.js                  | 1 +
 6 files changed, 6 insertions(+)

diff --git a/lib/api/messages.js b/lib/api/messages.js
index d2ed7ce6..4b7bcc7d 100644
--- a/lib/api/messages.js
+++ b/lib/api/messages.js
@@ -3082,6 +3082,7 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
                                     uid: messageData.uid,
                                     flags: messageData.flags,
                                     message: messageData._id,
+                                    thread: messageData.thread,
                                     unseenChange: false
                                 }
                             ];
diff --git a/lib/api/submit.js b/lib/api/submit.js
index 92f92c57..9263ed3d 100644
--- a/lib/api/submit.js
+++ b/lib/api/submit.js
@@ -156,6 +156,7 @@ module.exports = (db, server, messageHandler, userHandler, settingsHandler) => {
                                                 uid: messageData.uid,
                                                 flags: messageData.flags,
                                                 message: messageData._id,
+                                                thread: messageData.thread,
                                                 unseenChange: false
                                             }
                                         ];
diff --git a/lib/handlers/on-fetch.js b/lib/handlers/on-fetch.js
index a0a494dc..e4677859 100644
--- a/lib/handlers/on-fetch.js
+++ b/lib/handlers/on-fetch.js
@@ -376,6 +376,7 @@ module.exports = (server, messageHandler, userCache) => (mailbox, options, sessi
                                         ignore: session.id,
                                         uid: messageData.uid,
                                         flags: messageData.flags,
+                                        thread: messageData.thread,
                                         message: messageData._id,
                                         unseenChange: true
                                     });
diff --git a/lib/handlers/on-store.js b/lib/handlers/on-store.js
index 191552cc..efb1743a 100644
--- a/lib/handlers/on-store.js
+++ b/lib/handlers/on-store.js
@@ -349,6 +349,7 @@ module.exports = server => (mailbox, update, session, callback) => {
                                 ignore: session.id,
                                 uid: message.uid,
                                 flags: message.flags,
+                                thread: message.thread,
                                 message: message._id,
                                 modseq,
                                 unseenChange
diff --git a/lib/message-handler.js b/lib/message-handler.js
index 41f873da..13635ada 100644
--- a/lib/message-handler.js
+++ b/lib/message-handler.js
@@ -1862,6 +1862,7 @@ class MessageHandler {
                                     command: 'FETCH',
                                     uid: messageData.uid,
                                     flags: messageData.flags,
+                                    thread: messageData.thread,
                                     message: messageData._id,
                                     unseenChange: 'seen' in changes
                                 });
diff --git a/pop3.js b/pop3.js
index e2f5e983..374be7fa 100644
--- a/pop3.js
+++ b/pop3.js
@@ -407,6 +407,7 @@ function markAsSeen(session, messages, callback) {
                                 command: 'FETCH',
                                 uid: message.uid,
                                 flags: message.flags.concat('\\Seen'),
+                                thread: message.thread,
                                 message: new ObjectId(message.id),
                                 modseq: mailboxData.modifyIndex,
                                 // Indicate that unseen values are changed. Not sure how much though