mirror of
https://github.com/nodemailer/wildduck.git
synced 2025-10-27 14:37:33 +08:00
updated reply handling
This commit is contained in:
parent
5ab86ca309
commit
9da2ad5679
1 changed files with 7 additions and 3 deletions
|
|
@ -2290,11 +2290,12 @@ module.exports = (db, server, messageHandler, userHandler) => {
|
||||||
let envelope = compiled.getEnvelope();
|
let envelope = compiled.getEnvelope();
|
||||||
|
|
||||||
envelope.from = data.from.address = await validateFromAddress(userData, envelope.from);
|
envelope.from = data.from.address = await validateFromAddress(userData, envelope.from);
|
||||||
|
console.log(envelope.to);
|
||||||
if (!envelope.to.length && referencedMessage && ['reply', 'replyAll'].includes(result.value.reference.action)) {
|
if (!envelope.to.length && referencedMessage && ['reply', 'replyAll'].includes(result.value.reference.action)) {
|
||||||
|
console.log(referencedMessage);
|
||||||
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(data.to || []).concat(referencedMessage.replyTo || []);
|
|
||||||
data.cc = [].concat(data.cc || []).concat(referencedMessage.replyCc || []);
|
|
||||||
}
|
}
|
||||||
|
console.log(envelope);
|
||||||
|
|
||||||
if (!req.params.raw) {
|
if (!req.params.raw) {
|
||||||
raw = await getCompiledMessage(data);
|
raw = await getCompiledMessage(data);
|
||||||
|
|
@ -3441,6 +3442,8 @@ module.exports = (db, server, messageHandler, userHandler) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
let headers = (messageData && messageData.mimeTree && messageData.mimeTree.parsedHeader) || {};
|
let headers = (messageData && messageData.mimeTree && messageData.mimeTree.parsedHeader) || {};
|
||||||
|
console.log(headers);
|
||||||
|
|
||||||
let subject = headers.subject || '';
|
let subject = headers.subject || '';
|
||||||
try {
|
try {
|
||||||
subject = libmime.decodeWords(subject).trim();
|
subject = libmime.decodeWords(subject).trim();
|
||||||
|
|
@ -3458,7 +3461,8 @@ module.exports = (db, server, messageHandler, userHandler) => {
|
||||||
let uniqueRecipients = new Set();
|
let uniqueRecipients = new Set();
|
||||||
|
|
||||||
let checkAddress = (target, addr) => {
|
let checkAddress = (target, addr) => {
|
||||||
let addrview = tools.normalizeAddress(addr.addres, false, { removeLabel: true, removeDots: true });
|
let addrview = tools.normalizeAddress(addr.address, false, { removeLabel: true, removeDots: true });
|
||||||
|
console.log(addr.address, addrview, userAddresses.includes(addrview));
|
||||||
if (!userAddresses.includes(addrview) && !uniqueRecipients.has(addrview)) {
|
if (!userAddresses.includes(addrview) && !uniqueRecipients.has(addrview)) {
|
||||||
uniqueRecipients.add(addrview);
|
uniqueRecipients.add(addrview);
|
||||||
if (addr.name) {
|
if (addr.name) {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue