Going back to what works.
Manifest v3 and its consequences have been a disaster for the human race.
This commit is contained in:
parent
f9a31415a0
commit
6a85dbb2eb
3 changed files with 144 additions and 153 deletions
|
@ -126,7 +126,7 @@ function buildEmailText(full) {
|
||||||
const attachments = [];
|
const attachments = [];
|
||||||
collectText(full, bodyParts, attachments);
|
collectText(full, bodyParts, attachments);
|
||||||
const headers = Object.entries(full.headers || {})
|
const headers = Object.entries(full.headers || {})
|
||||||
.map(([k,v]) => `${k}: ${v.join(' ')}`)
|
.map(([k, v]) => `${k}: ${v.join(' ')}`)
|
||||||
.join('\n');
|
.join('\n');
|
||||||
const attachInfo = `Attachments: ${attachments.length}` + (attachments.length ? "\n" + attachments.map(a => ` - ${a}`).join('\n') : "");
|
const attachInfo = `Attachments: ${attachments.length}` + (attachments.length ? "\n" + attachments.map(a => ` - ${a}`).join('\n') : "");
|
||||||
const combined = `${headers}\n${attachInfo}\n\n${bodyParts.join('\n')}`.trim();
|
const combined = `${headers}\n${attachInfo}\n\n${bodyParts.join('\n')}`.trim();
|
||||||
|
@ -369,27 +369,6 @@ async function clearCacheForMessages(idsInput) {
|
||||||
icons: { "16": "resources/img/brain.png" }
|
icons: { "16": "resources/img/brain.png" }
|
||||||
});
|
});
|
||||||
|
|
||||||
//for the love of god work please
|
|
||||||
browser.messageDisplayAction.onClicked.addListener(async (tab, info) => {
|
|
||||||
try {
|
|
||||||
let header = await browser.messageDisplay.getDisplayedMessages(tab.id);
|
|
||||||
if (!header) {
|
|
||||||
logger.aiLog("No header, no message loaded?", { debug: true });
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const url = browser.runtime.getURL(`details.html?mid=${header.id}`);
|
|
||||||
await browser.messageDisplayAction.setPopup({ tabId: tab.id, popup: url });
|
|
||||||
await browser.messageDisplayAction.openPopup({ tabId: tab.id });
|
|
||||||
} catch (err) {
|
|
||||||
logger.aiLog("Failed to open details popup", { debug: true });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
browser.messageDisplay.onMessagesDisplayed.addListener(async (tab, displayedMessages) => {
|
|
||||||
logger.aiLog("Messages displayed!", { debug: true }, displayedMessages);
|
|
||||||
});
|
|
||||||
|
|
||||||
browser.menus.onClicked.addListener(async (info, tab) => {
|
browser.menus.onClicked.addListener(async (info, tab) => {
|
||||||
if (info.menuItemId === "apply-ai-rules-list" || info.menuItemId === "apply-ai-rules-display") {
|
if (info.menuItemId === "apply-ai-rules-list" || info.menuItemId === "apply-ai-rules-display") {
|
||||||
const ids = info.selectedMessages?.messages?.map(m => m.id) ||
|
const ids = info.selectedMessages?.messages?.map(m => m.id) ||
|
||||||
|
@ -418,17 +397,17 @@ async function clearCacheForMessages(idsInput) {
|
||||||
|
|
||||||
if (msg?.type === "sortana:test") {
|
if (msg?.type === "sortana:test") {
|
||||||
const { text = "", criterion = "" } = msg;
|
const { text = "", criterion = "" } = msg;
|
||||||
logger.aiLog("sortana:test – text", {debug: true}, text);
|
logger.aiLog("sortana:test – text", { debug: true }, text);
|
||||||
logger.aiLog("sortana:test – criterion", {debug: true}, criterion);
|
logger.aiLog("sortana:test – criterion", { debug: true }, criterion);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
logger.aiLog("Calling AiClassifier.classifyText()", {debug: true});
|
logger.aiLog("Calling AiClassifier.classifyText()", { debug: true });
|
||||||
const result = await AiClassifier.classifyText(text, criterion);
|
const result = await AiClassifier.classifyText(text, criterion);
|
||||||
logger.aiLog("classify() returned", {debug: true}, result);
|
logger.aiLog("classify() returned", { debug: true }, result);
|
||||||
return { match: result };
|
return { match: result };
|
||||||
}
|
}
|
||||||
catch (err) {
|
catch (err) {
|
||||||
logger.aiLog("Error in classify()", {level: 'error'}, err);
|
logger.aiLog("Error in classify()", { level: 'error' }, err);
|
||||||
// rethrow so the caller sees the failure
|
// rethrow so the caller sees the failure
|
||||||
throw err;
|
throw err;
|
||||||
}
|
}
|
||||||
|
@ -505,7 +484,9 @@ async function clearCacheForMessages(idsInput) {
|
||||||
try {
|
try {
|
||||||
const [tab] = await browser.tabs.query({ active: true, currentWindow: true });
|
const [tab] = await browser.tabs.query({ active: true, currentWindow: true });
|
||||||
const messages = await browser.messageDisplay.getDisplayedMessages(tab?.id);
|
const messages = await browser.messageDisplay.getDisplayedMessages(tab?.id);
|
||||||
return { messages };
|
const ids = messages.map(hdr => hdr.id);
|
||||||
|
|
||||||
|
return { ids };
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.aiLog("failed to get displayed messages", { level: 'error' }, e);
|
logger.aiLog("failed to get displayed messages", { level: 'error' }, e);
|
||||||
return { messages: [] };
|
return { messages: [] };
|
||||||
|
@ -533,25 +514,25 @@ async function clearCacheForMessages(idsInput) {
|
||||||
stddev: std
|
stddev: std
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
logger.aiLog("Unknown message type, ignoring", {level: 'warn'}, msg?.type);
|
logger.aiLog("Unknown message type, ignoring", { level: 'warn' }, msg?.type);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Automatically classify new messages
|
// Automatically classify new messages
|
||||||
if (typeof messenger !== "undefined" && messenger.messages?.onNewMailReceived) {
|
if (typeof messenger !== "undefined" && messenger.messages?.onNewMailReceived) {
|
||||||
messenger.messages.onNewMailReceived.addListener(async (folder, messages) => {
|
messenger.messages.onNewMailReceived.addListener(async (folder, messages) => {
|
||||||
logger.aiLog("onNewMailReceived", {debug: true}, messages);
|
logger.aiLog("onNewMailReceived", { debug: true }, messages);
|
||||||
const ids = (messages?.messages || messages || []).map(m => m.id ?? m);
|
const ids = (messages?.messages || messages || []).map(m => m.id ?? m);
|
||||||
await applyAiRules(ids);
|
await applyAiRules(ids);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
logger.aiLog("messenger.messages API unavailable, skipping new mail listener", { level: 'warn' });
|
logger.aiLog("messenger.messages API unavailable, skipping new mail listener", { level: 'warn' });
|
||||||
}
|
}
|
||||||
|
|
||||||
// Catch any unhandled rejections
|
// Catch any unhandled rejections
|
||||||
window.addEventListener("unhandledrejection", ev => {
|
window.addEventListener("unhandledrejection", ev => {
|
||||||
logger.aiLog("Unhandled promise rejection", {level: 'error'}, ev.reason);
|
logger.aiLog("Unhandled promise rejection", { level: 'error' }, ev.reason);
|
||||||
});
|
});
|
||||||
|
|
||||||
browser.runtime.onInstalled.addListener(async ({ reason }) => {
|
browser.runtime.onInstalled.addListener(async ({ reason }) => {
|
||||||
if (reason === "install") {
|
if (reason === "install") {
|
||||||
|
|
|
@ -10,8 +10,17 @@ if (!isNaN(qMid)) {
|
||||||
if (messages && messages[0]) {
|
if (messages && messages[0]) {
|
||||||
loadMessage(messages[0].id);
|
loadMessage(messages[0].id);
|
||||||
} else {
|
} else {
|
||||||
|
const tabs = await browser.tabs.query({ active: true, currentWindow: true });
|
||||||
|
const tabId = tabs[0]?.id;
|
||||||
|
const msgs = tabId ? await browser.messageDisplay.getDisplayedMessages(tabId) : [];
|
||||||
|
let id = msgs[0]?.id;
|
||||||
|
if (id) {
|
||||||
|
loadMessage(id);
|
||||||
|
}
|
||||||
|
else {
|
||||||
aiLog("Details popup: no displayed message found");
|
aiLog("Details popup: no displayed message found");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function loadMessage(id) {
|
async function loadMessage(id) {
|
||||||
|
|
|
@ -24,7 +24,8 @@
|
||||||
"message_display_action": {
|
"message_display_action": {
|
||||||
"default_icon": "resources/img/brain.png",
|
"default_icon": "resources/img/brain.png",
|
||||||
"default_title": "Details",
|
"default_title": "Details",
|
||||||
"default_label": "Details"
|
"default_label": "Details",
|
||||||
|
"default_popup": "details.html"
|
||||||
},
|
},
|
||||||
"background": { "scripts": [ "background.js" ] },
|
"background": { "scripts": [ "background.js" ] },
|
||||||
"options_ui": {
|
"options_ui": {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue