jason/ThunderAI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improved multipart html body decoding

Browse source
This commit is contained in:
Mic 2026-04-12 22:10:00 +02:00 committed by mic
parent 0691a027a9
commit fa885f44dd
2 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
js/mzta-utils.js
View file

@ -146,38 +146,52 @@ export async function getMailSubject(tab){
}
function extractTextParts(fullMessage) {
const textParts = [];
const textParts = []
function walkParts(parts) {
for (const part of parts) {
if (part.parts && part.parts.length > 0) {
// Recursively walk through sub-parts
walkParts(part.parts);
} else {
// Check if contentType starts with "text/"
if (part.contentType && part.contentType.startsWith("text/")) {
textParts.push(part);
}
walkParts(part.parts)
}
// console.log(">>>>>>>>>>>> extractTextParts: part.contentType: " + part.contentType + ", part.decryptionStatus: " + part.decryptionStatus + ", part.body: " + part.body);
if (part.contentType && part.contentType.startsWith('text/')) {
textParts.push(part)
}
}
}
if (fullMessage.parts && fullMessage.parts.length > 0) {
walkParts(fullMessage.parts);
walkParts(fullMessage.parts)
}
return textParts
}
return textParts;
function smartDecode(buf) {
try {
return new TextDecoder('utf-8', { fatal: true }).decode(buf);
} catch (e) {
return new TextDecoder('windows-1252').decode(buf);
}
}
export function getMailBody(fullMessage){
export async function getMailBody(fullMessage, messageId) {
const textParts = extractTextParts(fullMessage);
let text = "";
let html = "";
// console.log(">>>>>>>>>>>>>> getMailBody: textParts: " + JSON.stringify(textParts));
// console.log(">>>>>>>>>>>>>> getMailBody: fullMessage: " + JSON.stringify(fullMessage));
for (const part of textParts) {
let body = part.body;
if ((body === undefined || body === "") && messageId && part.partName) {
const file = await browser.messages.getAttachmentFile(messageId, part.partName);
const buf = await file.arrayBuffer();
//const buf = new TextDecoder('utf-8').decode(buf);
body = smartDecode(buf);
}
if (part.contentType === "text/plain") {
text += part.body;
// console.log(">>>>>>>>>>>>>> getMailBody: part.body (TEXT): " + body);
text += body ?? "";
} else if (part.contentType === "text/html") {
html += part.body;
// console.log(">>>>>>>>>>>>>> getMailBody: part.body (HTML): " + (body ? body.substring(0, 80) : body));
html += body ?? "";
}
}
if(html === "") {

4
mzta-background.js
View file

@ -799,7 +799,7 @@ async function _generateSpamReportForMessage(headerMessageId, options = {}) {
}
message = messageResult.messages[0];
curr_fullMessage = await browser.messages.getFull(message.id);
msg_text = getMailBody(curr_fullMessage);
msg_text = await getMailBody(curr_fullMessage);
body_text = htmlBodyToPlainText(msg_text.html);
if (body_text.length == 0) {
body_text = msg_text.text.replace(/\s+/g, ' ').trim();
@ -1729,7 +1729,7 @@ async function processEmails(args) {
if (addTagsAuto || spamFilter) {
curr_fullMessage = await browser.messages.getFull(message.id);
msg_text = getMailBody(curr_fullMessage);
msg_text = await getMailBody(curr_fullMessage);
taLog.log("Starting from the HTML body if present and converting to plain text...");
body_text = htmlBodyToPlainText(msg_text.html);
if( body_text.length == 0 ){