serv/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-01-14 09:16:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

webmail: leave out own address in reply all when we have addresses remaining

Browse source
This commit is contained in:
Mechiel Lukkien 2024-03-04 19:51:55 +01:00
parent 26ff0c9417
commit 63c3c1fd6a
No known key found for this signature in database
2 changed files with 62 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
webmail/webmail.js
View file

@ -3057,7 +3057,7 @@ const newMsgView = (miv, msglistView, listMailboxes, possibleLabels, messageLoad
parsedMessageResolve = resolve; parsedMessageResolve = resolve;
parsedMessageReject = reject; parsedMessageReject = reject;
}); });
const react = async (to, cc, bcc, forward, all) => { const react = async (to, cc, bcc, forward) => {
const pm = await parsedMessagePromise; const pm = await parsedMessagePromise;
let body = ''; let body = '';
const sel = window.getSelection(); const sel = window.getSelection();
@ -3104,26 +3104,45 @@ const newMsgView = (miv, msglistView, listMailboxes, possibleLabels, messageLoad
responseMessageID: m.ID, responseMessageID: m.ID,
isList: m.IsMailingList, isList: m.IsMailingList,
}; };
if (all) {
opts.to = (to || []).concat((mi.Envelope.To || []).filter(a => !envelopeIdentity([a]))).map(a => formatAddress(a));
opts.cc = (mi.Envelope.CC || []).map(a => formatAddress(a));
opts.bcc = (mi.Envelope.BCC || []).map(a => formatAddress(a));
}
compose(opts); compose(opts);
}; };
const reply = async (all, toOpt) => { const reply = async (all) => {
if (!all && !toOpt && (mi.Envelope.From || []).length === 1 && envelopeIdentity(mi.Envelope.From || [])) { const contains = (l, a) => !!l.find(e => equalAddress(e, a));
await react(mi.Envelope.To || [], mi.Envelope.CC || [], mi.Envelope.BCC || [], false, all); let to = [];
let cc = [];
let bcc = [];
if ((mi.Envelope.From || []).length === 1 && envelopeIdentity(mi.Envelope.From || [])) {
// Replying to our own message, copy the original cc/bcc.
to = mi.Envelope.To || [];
} }
else { else {
await react(toOpt || ((mi.Envelope.ReplyTo || []).length > 0 ? mi.Envelope.ReplyTo : mi.Envelope.From) || [], [], [], false, all); if (mi.Envelope.ReplyTo && mi.Envelope.ReplyTo.length > 0) {
to = mi.Envelope.ReplyTo;
}
else {
to = mi.Envelope.From || [];
}
if (all) {
for (const a of (mi.Envelope.To || [])) {
if (!contains(to, a) && !envelopeIdentity([a])) {
to.push(a);
}
}
}
} }
if (all) {
cc = mi.Envelope.CC || [];
bcc = mi.Envelope.BCC || [];
}
cc = cc.filter((a, i) => !envelopeIdentity([a]) && !contains(to, a) && !contains(cc.slice(0, i), a));
bcc = bcc.filter(a => !envelopeIdentity([a]));
await react(to, cc, bcc, false);
}; };
const cmdForward = async () => { react([], [], [], true, false); }; const cmdForward = async () => { react([], [], [], true); };
const cmdReplyList = async () => { const cmdReplyList = async () => {
const pm = await parsedMessagePromise; const pm = await parsedMessagePromise;
if (pm.ListReplyAddress) { if (pm.ListReplyAddress) {
await reply(false, [pm.ListReplyAddress]); await react([pm.ListReplyAddress], [], [], false);
} }
}; };
const cmdReply = async () => { await reply(false); }; const cmdReply = async () => { await reply(false); };

43
webmail/webmail.ts
View file

@ -2448,7 +2448,7 @@ const newMsgView = (miv: MsgitemView, msglistView: MsglistView, listMailboxes: l
parsedMessageReject = reject parsedMessageReject = reject
}) })
const react = async (to: api.MessageAddress[], cc: api.MessageAddress[], bcc: api.MessageAddress[], forward: boolean, all: boolean) => { const react = async (to: api.MessageAddress[], cc: api.MessageAddress[], bcc: api.MessageAddress[], forward: boolean) => {
const pm = await parsedMessagePromise const pm = await parsedMessagePromise
let body = '' let body = ''
const sel = window.getSelection() const sel = window.getSelection()
@ -2492,26 +2492,45 @@ const newMsgView = (miv: MsgitemView, msglistView: MsglistView, listMailboxes: l
responseMessageID: m.ID, responseMessageID: m.ID,
isList: m.IsMailingList, isList: m.IsMailingList,
} }
if (all) {
opts.to = (to || []).concat((mi.Envelope.To || []).filter(a => !envelopeIdentity([a]))).map(a => formatAddress(a))
opts.cc = (mi.Envelope.CC || []).map(a => formatAddress(a))
opts.bcc = (mi.Envelope.BCC || []).map(a => formatAddress(a))
}
compose(opts) compose(opts)
} }
const reply = async (all: boolean, toOpt?: api.MessageAddress[]) => { const reply = async (all: boolean) => {
if (!all && !toOpt && (mi.Envelope.From || []).length === 1 && envelopeIdentity(mi.Envelope.From || [])) { const contains = (l: api.MessageAddress[], a: api.MessageAddress): boolean => !!l.find(e => equalAddress(e, a))
await react(mi.Envelope.To || [], mi.Envelope.CC || [], mi.Envelope.BCC || [], false, all)
let to: api.MessageAddress[] = []
let cc: api.MessageAddress[] = []
let bcc: api.MessageAddress[] = []
if ((mi.Envelope.From || []).length === 1 && envelopeIdentity(mi.Envelope.From || [])) {
// Replying to our own message, copy the original cc/bcc.
to = mi.Envelope.To || []
} else { } else {
await react(toOpt || ((mi.Envelope.ReplyTo || []).length > 0 ? mi.Envelope.ReplyTo : mi.Envelope.From) || [], [], [], false, all) if (mi.Envelope.ReplyTo && mi.Envelope.ReplyTo.length > 0) {
to = mi.Envelope.ReplyTo
} else {
to = mi.Envelope.From || []
}
if (all) {
for (const a of (mi.Envelope.To || [])) {
if (!contains(to, a) && !envelopeIdentity([a])) {
to.push(a)
}
}
}
} }
if (all) {
cc = mi.Envelope.CC || []
bcc = mi.Envelope.BCC || []
}
cc = cc.filter((a, i) => !envelopeIdentity([a]) && !contains(to, a) && !contains(cc.slice(0, i), a))
bcc = bcc.filter(a => !envelopeIdentity([a]))
await react(to, cc, bcc, false)
} }
const cmdForward = async () => { react([], [], [], true, false) } const cmdForward = async () => { react([], [], [], true) }
const cmdReplyList = async () => { const cmdReplyList = async () => {
const pm = await parsedMessagePromise const pm = await parsedMessagePromise
if (pm.ListReplyAddress) { if (pm.ListReplyAddress) {
await reply(false, [pm.ListReplyAddress]) await react([pm.ListReplyAddress], [], [], false)
} }
} }
const cmdReply = async () => { await reply(false) } const cmdReply = async () => { await reply(false) }