Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2025-11-01 19:05:48 +01:00
Code Issues Packages Projects Releases Activity

Fix new mail update

Browse Source
This commit is contained in:
Ximi1970
2024-07-18 15:23:50 +02:00
parent 070b495b8c
commit 8fb1a55974
1 changed files with 116 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

230
webext/background.js
View File

@@ -241,128 +241,49 @@ SysTrayX.Messaging = {
listenerFolderInfoChanged: async function (folder, folderInfo) { listenerFolderInfoChanged: async function (folder, folderInfo) {
//console.debug("folderInfoChanged: folder: " + JSON.stringify(folder)); console.debug("folderInfoChanged: folder: " + JSON.stringify(folder));
//console.debug("folderInfoChanged: folderinfo: " + JSON.stringify(folderInfo)); console.debug("folderInfoChanged: folderinfo: " + JSON.stringify(folderInfo));
//console.debug("folderInfoChanged: Cache: " + SysTrayX.Messaging.folderInfoChangeCache.length ); //console.debug("folderInfoChanged: Cache: " + SysTrayX.Messaging.folderInfoChangeCache.length );
if (SysTrayX.Info.browserInfo.majorVersion < 115 || SysTrayX.Messaging.apiCountMethod === "false") { if (SysTrayX.Info.browserInfo.majorVersion < 115 || SysTrayX.Messaging.apiCountMethod === "false") {
if (!SysTrayX.Messaging.startupDelayFinished) {
// Cache the folder change
if (folder)
{
SysTrayX.Messaging.folderInfoChangeCache.push({ folder, folderInfo });
}
} else {
if (SysTrayX.Messaging.startupDelayFinished)
{
console.debug("folderInfoChanged: delay finished");
// Cache the folder change if( SysTrayX.Messaging.folderInfoChangeCache.length > 0 ) {
if (folder)
{
SysTrayX.Messaging.folderInfoChangeCache.push({ folder, folderInfo });
}
if (SysTrayX.Messaging.startupDelayFinished) console.debug("folderInfoChanged: handle cache");
{ console.debug("FolderInfoChanged: cache: " + JSON.stringify(SysTrayX.Messaging.folderInfoChangeCache));
//console.debug("folderInfoChanged: delay finished");
if( SysTrayX.Messaging.folderInfoChangeCache.length > 0 ) { // Process the received messages
for (const cache of SysTrayX.Messaging.folderInfoChangeCache) {
//console.debug("folderInfoChanged: handle cache"); if (cache.folderInfo.unreadMessageCount !== undefined) {
if (SysTrayX.Messaging.unread[cache.folder.accountId] === undefined) {
// Process the received messages SysTrayX.Messaging.unread[cache.folder.accountId] = {};
for (const cache of SysTrayX.Messaging.folderInfoChangeCache) {
if (cache.folderInfo.unreadMessageCount !== undefined) {
if (SysTrayX.Messaging.unread[cache.folder.accountId] === undefined) {
SysTrayX.Messaging.unread[cache.folder.accountId] = {};
}
if (SysTrayX.Messaging.new[cache.folder.accountId] === undefined) {
SysTrayX.Messaging.new[cache.folder.accountId] = {};
}
if (SysTrayX.Messaging.new[cache.folder.accountId][cache.folder.path] === undefined) {
SysTrayX.Messaging.new[cache.folder.accountId][cache.folder.path] = [];
}
SysTrayX.Messaging.unread[cache.folder.accountId][cache.folder.path] =
cache.folderInfo.unreadMessageCount;
// Check if the new mails have been read, removed from new storage
const messages = SysTrayX.Messaging.new[cache.folder.accountId][cache.folder.path];
if (messages.length > 0) {
const newMessages = [];
for (let i = 0; i < messages.length; ++i) {
const message = messages[i];
const getHeaderPromise = (messageId) =>
new Promise((res) => res(messenger.messages.get(messageId)));
const header = await getHeaderPromise(message.id);
if (!header.read) {
newMessages.push(message);
}
} }
//console.debug("FolderInfoChanged: Clear"); if (SysTrayX.Messaging.new[cache.folder.accountId] === undefined) {
//console.debug("FolderInfoChanged: Old: " + JSON.stringify(SysTrayX.Messaging.new[cache.folder.accountId][cache.folder.path])); SysTrayX.Messaging.new[cache.folder.accountId] = {};
//console.debug("FolderInfoChanged: New: " + JSON.stringify(newMessages));
SysTrayX.Messaging.new[cache.folder.accountId][cache.folder.path] = [
...newMessages,
];
}
}
// Cache handled
SysTrayX.Messaging.folderInfoChangeCache = [];
}
} else {
//console.debug("folderInfoChanged: handle default");
// Count the initial unread messages
for (const filter of SysTrayX.Messaging.filters) {
const accountId = filter.accountId;
for (const storedFolder of filter.folders) {
let path;
let folderParam;
if (typeof(storedFolder) === "string") {
// Filters pre TB 121
path = storedFolder;
folderParam = {
accountId: accountId,
path: storedFolder,
};
} else {
// Filters TB 121
if (storedFolder.mailFolderId === undefined) {
// TB 121 filter setup but older TB
path = storedFolder.path;
folderParam = {
accountId: accountId,
path: path,
};
} else {
path = storedFolder.path;
folderParam = storedFolder.mailFolderId;
}
}
// Check unread mails
let mailFolderInfo = {};
try {
mailFolderInfo = await browser.folders.getFolderInfo(folderParam);
} catch (err) {
console.debug("Filter error: " + err);
console.debug("Filter error: " + JSON.stringify(folder));
}
if (mailFolderInfo.unreadMessageCount !== undefined) {
if (SysTrayX.Messaging.unread[accountId] === undefined) {
SysTrayX.Messaging.unread[accountId] = {};
} }
SysTrayX.Messaging.unread[accountId][path] = if (SysTrayX.Messaging.new[cache.folder.accountId][cache.folder.path] === undefined) {
mailFolderInfo.unreadMessageCount; SysTrayX.Messaging.new[cache.folder.accountId][cache.folder.path] = [];
} }
// Check if the new mails have been read, removed from new storage console.debug("FolderInfoChanged: Unread: " + JSON.stringify(cache.folderInfo.unreadMessageCount));
if (SysTrayX.Messaging.new[accountId] !== undefined &&
SysTrayX.Messaging.new[accountId][path] !== undefined ) { SysTrayX.Messaging.unread[cache.folder.accountId][cache.folder.path] =
const messages = SysTrayX.Messaging.new[accountId][path]; cache.folderInfo.unreadMessageCount;
// Check if the new mails have been read, removed from new storage
const messages = SysTrayX.Messaging.new[cache.folder.accountId][cache.folder.path];
if (messages.length > 0) { if (messages.length > 0) {
const newMessages = []; const newMessages = [];
@@ -378,15 +299,98 @@ SysTrayX.Messaging = {
} }
} }
SysTrayX.Messaging.new[accountId][path] = [ //console.debug("FolderInfoChanged: Clear");
//console.debug("FolderInfoChanged: Old: " + JSON.stringify(SysTrayX.Messaging.new[cache.folder.accountId][cache.folder.path]));
console.debug("FolderInfoChanged: New: " + JSON.stringify(newMessages));
SysTrayX.Messaging.new[cache.folder.accountId][cache.folder.path] = [
...newMessages, ...newMessages,
]; ];
} }
} }
// Cache handled
SysTrayX.Messaging.folderInfoChangeCache = [];
}
} else {
console.debug("folderInfoChanged: handle default");
// Count the initial unread messages
for (const filter of SysTrayX.Messaging.filters) {
const accountId = filter.accountId;
for (const storedFolder of filter.folders) {
let path;
let folderParam;
if (typeof(storedFolder) === "string") {
// Filters pre TB 121
path = storedFolder;
folderParam = {
accountId: accountId,
path: storedFolder,
};
} else {
// Filters TB 121
if (storedFolder.mailFolderId === undefined) {
// TB 121 filter setup but older TB
path = storedFolder.path;
folderParam = {
accountId: accountId,
path: path,
};
} else {
path = storedFolder.path;
folderParam = storedFolder.mailFolderId;
}
}
// Check unread mails
let mailFolderInfo = {};
try {
mailFolderInfo = await browser.folders.getFolderInfo(folderParam);
} catch (err) {
console.debug("Filter error: " + err);
console.debug("Filter error: " + JSON.stringify(folder));
}
if (mailFolderInfo.unreadMessageCount !== undefined) {
if (SysTrayX.Messaging.unread[accountId] === undefined) {
SysTrayX.Messaging.unread[accountId] = {};
}
SysTrayX.Messaging.unread[accountId][path] =
mailFolderInfo.unreadMessageCount;
}
// Check if the new mails have been read, removed from new storage
if (SysTrayX.Messaging.new[accountId] !== undefined &&
SysTrayX.Messaging.new[accountId][path] !== undefined ) {
const messages = SysTrayX.Messaging.new[accountId][path];
if (messages.length > 0) {
const newMessages = [];
for (let i = 0; i < messages.length; ++i) {
const message = messages[i];
const getHeaderPromise = (messageId) =>
new Promise((res) => res(messenger.messages.get(messageId)));
const header = await getHeaderPromise(message.id);
if (!header.read) {
newMessages.push(message);
}
}
SysTrayX.Messaging.new[accountId][path] = [
...newMessages,
];
}
}
}
} }
} }
sendMailCountPre115();
} }
sendMailCountPre115();
} }
} else { } else {
if (SysTrayX.Messaging.startupDelayFinished) if (SysTrayX.Messaging.startupDelayFinished)