mirror of
https://github.com/nodemailer/wildduck.git
synced 2025-09-30 00:45:32 +08:00
updated reply handling
This commit is contained in:
parent
051a6b4438
commit
bec31dcd78
1 changed files with 4 additions and 1 deletions
|
@ -2253,7 +2253,7 @@ module.exports = (db, server, messageHandler, userHandler) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
let data = {
|
let data = {
|
||||||
from: result.value.from || { name: '', address: '' },
|
from: result.value.from || { name: userData.name, address: userData.address },
|
||||||
date,
|
date,
|
||||||
to: result.value.to,
|
to: result.value.to,
|
||||||
cc: result.value.cc,
|
cc: result.value.cc,
|
||||||
|
@ -2292,6 +2292,8 @@ module.exports = (db, server, messageHandler, userHandler) => {
|
||||||
envelope.from = data.from.address = await validateFromAddress(userData, envelope.from);
|
envelope.from = data.from.address = await validateFromAddress(userData, envelope.from);
|
||||||
if (!envelope.to.length && referencedMessage && ['reply', 'replyAll'].includes(result.value.reference.action)) {
|
if (!envelope.to.length && referencedMessage && ['reply', 'replyAll'].includes(result.value.reference.action)) {
|
||||||
envelope.to = envelope.to.concat(parseAddresses(referencedMessage.replyTo || [])).concat(parseAddresses(referencedMessage.replyCc || []));
|
envelope.to = envelope.to.concat(parseAddresses(referencedMessage.replyTo || [])).concat(parseAddresses(referencedMessage.replyCc || []));
|
||||||
|
data.to = [].concat(referencedMessage.replyTo || []);
|
||||||
|
data.cc = [].concat(referencedMessage.replyCc || []);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!req.params.raw) {
|
if (!req.params.raw) {
|
||||||
|
@ -3439,6 +3441,7 @@ module.exports = (db, server, messageHandler, userHandler) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
let headers = (messageData && messageData.mimeTree && messageData.mimeTree.parsedHeader) || {};
|
let headers = (messageData && messageData.mimeTree && messageData.mimeTree.parsedHeader) || {};
|
||||||
|
|
||||||
let subject = headers.subject || '';
|
let subject = headers.subject || '';
|
||||||
try {
|
try {
|
||||||
subject = libmime.decodeWords(subject).trim();
|
subject = libmime.decodeWords(subject).trim();
|
||||||
|
|
Loading…
Add table
Reference in a new issue