Fix TB91 filter handlers

webext/js/defaults.js

@@ -201,303 +201,60 @@ async function getIcon() {
   }
 }
 
-//
-//  Check if the filters are for existing accounts
-//
-function checkAccountFilters(filters) {
-  let filtersChanged = false;
-  let newFilters = [];
-
-  //  Create an id -> name map
-  accountNames = {};
-  for (const account of SysTrayX.Messaging.accounts) {
-    accountNames[account.id] = account.name;
-  }
-
-  for (let i = 0; i < filters.length; ++i) {
-    let filter = filters[i];
-
-    const accountName = accountNames[filter.folder.accountId];
-    if (accountName === undefined) {
-      filtersChanged = true;
-      continue;
-    }
-
-    //  Store the passed filter
-    newFilters.push(filter);
-  }
-
-  return filtersChanged ? newFilters : undefined;
-}
-
-//  Create a folders array with paths for TB74+
-function createFoldersArrayPre74(baseFolders) {
-  let result = [];
-  let level = { result };
-
-  baseFolders.forEach((folder) => {
-    folder.path
-      .slice(1)
-      .split("/")
-      .reduce((r, name, i, a) => {
-        if (!r[name]) {
-          r[name] = { result: [] };
-          r.result.push({
-            accountId: folder.accountId,
-            name: folder.name,
-            type: folder.type,
-            path: folder.path,
-            subFolders: r[name].result,
-          });
-        }
-
-        return r[name];
-      }, level);
-  });
-
-  return createFoldersArray(result);
-}
-
-//  Create a folders array with paths for TB74+
-function createFoldersArray(baseFolders) {
-  let newFolders = [];
-
-  function traverse(path, folders) {
-    if (!folders) {
-      return;
-    }
-    for (let i = 0; i < folders.length; ++i) {
-      newFolders.push({
-        ...folders[i],
-        pathOrig: folders[i].path,
-        path: path + "/" + folders[i].name,
-      });
-      traverse(folders[i].path, folders[i].subFolders);
-    }
-  }
-
-  traverse("", baseFolders);
-
-  return newFolders;
-}
-
-//  Check if the filter folders still exists
-function checkFolderFilters(filters) {
-  let filtersChanged = false;
-  let newFilters = [];
-
-  //  Create an id -> name map
-  accountNames = {};
-  accountFolders = {};
-  for (const account of SysTrayX.Messaging.accounts) {
-    accountNames[account.id] = account.name;
-
-    if (SysTrayX.Info.browserInfo.majorVersion < 74) {
-      //  Pre TB74 accounts API
-      accountFolders[account.id] = createFoldersArrayPre74(account.folders);
-    } else {
-      //  TB74+ accounts API
-      accountFolders[account.id] = createFoldersArray(account.folders);
-    }
-  }
-
-  for (let i = 0; i < filters.length; ++i) {
-    let filter = filters[i];
-
-    const found = accountFolders[filter.folder.accountId].filter((folder) => {
-      if (filter.folder.version) {
-        const folderPaths = folder.path.split("/");
-        const folderPathLast = folderPaths.pop();
-        const folderPathFirst = folderPaths.join("/");
-
-        const filterFolderPaths = filter.folder.path.split("/");
-        const filterFolderPathLast = filterFolderPaths.pop();
-        const filterFolderPathFirst = filterFolderPaths.join("/");
-
-        if (
-          folderPathFirst === filterFolderPathFirst &&
-          folderPathLast !== filterFolderPathLast &&
-          ((folder.type === "inbox" && filter.folder.type === "inbox") ||
-            (folder.type === "drafts" && filter.folder.type === "drafts") ||
-            (folder.type === "sent" && filter.folder.type === "sent") ||
-            (folder.type === "trash" && filter.folder.type === "trash") ||
-            (folder.type === "templates" &&
-              filter.folder.type === "templates") ||
-            (folder.type === "archives" && filter.folder.type === "archives") ||
-            (folder.type === "junk" && filter.folder.type === "junk") ||
-            (folder.type === "outbox" && filter.folder.type === "outbox"))
-        ) {
-          filter.folder.path = folder.path;
-          filter.folder.name = folder.name;
-          filtersChanged = true;
-          return true;
-        }
-
-        if (folder.path === filter.folder.path) {
-          if (
-            folder.type != filter.folder.type &&
-            filter.folder.type == undefined
-          ) {
-            filter.folder.type = folder.type !== undefined ? folder.type : "";
-            filtersChanged = true;
-          }
-          return true;
-        }
-
-        return false;
-      } else {
-        return folder.pathOrig === filter.folder.path;
-      }
-    });
-
-    if (found.length === 0) {
-      console.debug("Removed filter: " + JSON.stringify(filter));
-
-      filtersChanged = true;
-      continue;
-    }
-
-    //  Upgrade filter
-    let folder = filter.folder;
-    if (filter.folder.accountName === undefined) {
-      folder.accountName = accountNames[found[0].accountId];
-      filtersChanged = true;
-    }
-    if (filter.folder.name === undefined) {
-      folder.name = found[0].name;
-      filtersChanged = true;
-    }
-    if (filter.folder.version === undefined) {
-      folder.version = SysTrayX.Info.version;
-      folder.path = found[0].path;
-      folder.name = found[0].path.split("/").pop();
-      filtersChanged = true;
-    }
-
-    //  Store the passed filter
-    newFilters.push(filter);
-  }
-
-  return filtersChanged ? newFilters : undefined;
-}
-
-//
-//  Check filters
-//
-function checkFilters(filters) {
-  let newFilters = [];
-
-  if (filters === undefined || filters.length === 0) {
-    //
-    //  No filters defined, create base filters
-    //
-    for (const account of SysTrayX.Messaging.accounts) {
-      const inbox = account.folders.filter((folder) => folder.type == "inbox");
-
-      if (inbox.length > 0) {
-        let folder = {};
-        if (SysTrayX.Info.browserInfo.majorVersion < 91) {
-          //          console.debug("Folder pre 91: " + JSON.stringify(inbox[0]));
-
-          folder = {
-            ...inbox[0],
-            accountName: account.name,
-            path: "/" + inbox[0].name,
-            version: SysTrayX.Info.version,
-          };
-          delete folder.subFolders;
-
-          newFilters.push({
-            unread: true,
-            folder: folder,
-          });
-        } else {
-          //          console.debug("Folder 91+: " + JSON.stringify(inbox[0]));
-
-          newFilters.push({
-            accountId: inbox[0].accountId,
-            version: SysTrayX.Info.version,
-            folders: [inbox[0].path],
-          });
-        }
-      }
-    }
-  } else {
-    const convertTo91Filters =
-      SysTrayX.Info.browserInfo.majorVersion >= 91 &&
-      filters[0].unread !== undefined;
-
-    console.debug("Convert filter: " + convertTo91Filters);
-
-    //  Check the filters
-    newFilters = filters;
-
-    /*
-    let filtersChanged = false;
-    let tmpFilters = undefined;
-
-    // Check if the filters are for the current accounts
-    tmpFilters = checkAccountFilters(newFilters);
-    if (tmpFilters) {
-      newFilters = tmpFilters;
-
-      console.debug("Filters Accounts updated")
-
-      filtersChanged = true;
-    }
-
-    // Check if the filters are for the current folders
-    tmpFilters = checkFolderFilters(newFilters);
-    if (tmpFilters) {
-      newFilters = tmpFilters;
-
-      console.debug("Filters Folders updated")
-
-      filtersChanged = true;
-    }
-
-    if (filtersChanged) {
-      //
-      //  Store the converted filters
-      //
-      await storage().set({
-        filters: newFilters,
-      });
-    }
-*/
-  }
-
-  return newFilters;
-}
-
 //
 //  Get filters
 //
 async function getFilters() {
   function resolve(result) {
-    const filters = result.filters || undefined;
+    let filters = result.filters || undefined;
-
-    if (filters !== undefined) {
-      console.debug("Stored filters: " + JSON.stringify(filters));
-    } else {
-      console.debug("Stored filters: undefined");
-    }
-
-    const newFilters = checkFilters(filters);
 
     if (filters === undefined || filters.length === 0) {
-      console.debug("Force new filters: " + JSON.stringify(newFilters));
+      //
+      //  No filters defined, create base filters
+      //
+      console.debug("Stored filters: undefined or empty");
 
-      return newFilters;
+      filters = [];
+      for (const account of SysTrayX.Messaging.accounts) {
+        const inbox = account.folders.filter(
+          (folder) => folder.type == "inbox"
+        );
+
+        if (inbox.length > 0) {
+          let folder = {};
+          if (SysTrayX.Info.browserInfo.majorVersion < 91) {
+            //          console.debug("Folder pre 91: " + JSON.stringify(inbox[0]));
+
+            folder = {
+              ...inbox[0],
+              accountName: account.name,
+              path: "/" + inbox[0].name,
+              version: SysTrayX.Info.version,
+            };
+            delete folder.subFolders;
+
+            filters.push({
+              unread: true,
+              folder: folder,
+            });
+          } else {
+            //          console.debug("Folder 91+: " + JSON.stringify(inbox[0]));
+
+            filters.push({
+              accountId: inbox[0].accountId,
+              version: SysTrayX.Info.version,
+              folders: [inbox[0].path],
+            });
+          }
+        }
+      }
+
+      console.debug("Force new filters: " + JSON.stringify(filters));
     } else {
-      return filters;
+      console.debug("Stored filters: " + JSON.stringify(filters));
     }
 
-    /*
+    return filters;
-    console.debug("Checked filters: " + JSON.stringify(newFilters));
-
-    return newFilters;
-    */
   }
 
   function reject() {
@@ -530,95 +287,79 @@ async function getMailFolderInfo(folder) {
 
 // Check if a folder is in the filter list
 function isFolderInFilters(folder) {
-  return (
+  const accountIndex = SysTrayX.Messaging.filters.findIndex(
-    SysTrayX.Messaging.filters.filter(
+    (account) => account.accountId === folder.accountId
-      (filter) =>
-        filter.folder.accountId === folder.accountId &&
-        (filter.folder.path === folder.path ||
-          filter.folder.path.toUpperCase() === folder.path)
-    ).length !== 0
   );
+
+  if (accountIndex !== -1) {
+    return (
+      SysTrayX.Messaging.filters[accountIndex].folders.filter(
+        (path) => path === folder.path
+      ).length > 0
+    );
+  } else {
+    return false;
+  }
 }
 
 // Check if the parent folder of a folder is in the filter list
 function isParentFolderInFilters(folder) {
   const parentPath = folder.path.substring(0, folder.path.lastIndexOf("/"));
 
-  return (
+  const accountIndex = SysTrayX.Messaging.filters.findIndex(
-    SysTrayX.Messaging.filters.filter(
+    (account) => account.accountId === folder.accountId
-      (filter) =>
-        filter.folder.accountId === folder.accountId &&
-        (filter.folder.path === parentPath ||
-          filter.folder.path.toUpperCase() === parentPath)
-    ).length !== 0
   );
+
+  if (accountIndex !== -1) {
+    return (
+      SysTrayX.Messaging.filters[accountIndex].folders.filter(
+        (path) => path === parentPath
+      ).length > 0
+    );
+  } else {
+    return false;
+  }
 }
 
 // Delete a folder from the filter list
 async function deleteFolderFromFilters(folder) {
-  const newFilters = SysTrayX.Messaging.filters.filter(
+  const accountIndex = SysTrayX.Messaging.filters.findIndex(
-    (filter) =>
+    (account) => account.accountId === folder.accountId
-      !(
-        filter.folder.accountId === folder.accountId &&
-        (filter.folder.path === folder.path ||
-          filter.folder.path.toUpperCase() === folder.path)
-      )
   );
 
-  //  Store the new filters
+  if (accountIndex !== -1) {
-  await storage().set({
+    const account = SysTrayX.Messaging.filters[accountIndex];
-    filters: newFilters,
+    account.folders = account.folders.filter((path) => path !== folder.path);
-  });
+
+    //  Store the new filters
+    await storage().set({
+      filters: SysTrayX.Messaging.filters,
+    });
+  }
 }
 
 // Get the account name from an id
 function getAccountName(id) {
-  const account = SysTrayX.Messaging.accounts.filter(
+  const account = SysTrayX.Messaging.accounts.find(
     (account) => account.id === id
-  )[0];
+  );
 
   return account.name;
 }
 
 // Add a folder to the filter list
 async function addFolderToFilters(newFolder) {
-  const folder = {
+  const accountIndex = SysTrayX.Messaging.filters.findIndex(
-    ...newFolder,
+    (account) => account.accountId === newFolder.accountId
-    accountName: getAccountName(newFolder.accountId),
+  );
-    version: SysTrayX.Info.version,
-  };
 
-  const filter = {
+  if (accountIndex !== -1) {
-    unread: true,
+    const account = SysTrayX.Messaging.filters[accountIndex];
-    folder: folder,
+    account.folders.push(newFolder.path);
-  };
 
-  const newFilters = SysTrayX.Messaging.filters;
+    //  Store the new filter
-  newFilters.push(filter);
+    await storage().set({
-
+      filters: SysTrayX.Messaging.filters,
-  //  Store the new filters
+    });
-  await storage().set({
+  }
-    filters: newFilters,
-  });
-}
-
-//
-//  Storage move
-//
-async function storageMove() {
-  const src = "sync";
-  const dst = "local";
-
-  //
-  //  Debug state
-  //
-  await storage(src)
-    .get("debug")
-    .then(
-      async (result) =>
-        result.debug &&
-        (await storage(dst).set({
-          debug: `${result.debug}`,
-        }))
-    );
 }