Fix check filters

webext/js/defaults.js

@@ -88,11 +88,10 @@ async function getMinimizeOnClose() {
 //  Check filters
 //
 function checkFilters(filters) {
-  let newFilters = filters;
+  let newFilters = [];
 
   if (filters === undefined) {
     //  Create base filters
-    newFilters = [];
     for (const account of SysTrayX.Messaging.accounts) {
       const inbox = account.folders.filter((folder) => folder.type == "inbox");
 
@@ -116,16 +115,8 @@ function checkFilters(filters) {
     });
   } else if (filters.length > 0) {
     //  Check the format
-    if (filters[0].folder.accountName === undefined) {
-      //  Old format, convert
-
-      console.log("Converting old filters");
-
-      accountNames = {};
-      for (const account of SysTrayX.Messaging.accounts) {
-        accountNames[account.id] = account.name;
-      }
 
+    //  Find a folder in a account structure
     function findFolder(accountId, path) {
       const account = SysTrayX.Messaging.accounts.filter(
         (account) => account.id === accountId
@@ -143,10 +134,12 @@ function checkFilters(filters) {
           folder.path.startsWith(path)
         );
 
-          if (folders.length > 1) {
+        if (folders.length === 0) {
-            return "^ Add base folder";
+          return undefined;
-          } else {
+        } else if (folders.length === 1) {
           return folder[0].name;
+        } else {
+          return "^ Add base folder";
         }
       } else {
         //
@@ -166,7 +159,9 @@ function checkFilters(filters) {
 
         traverse(account[0].folders, path);
 
-          if (arrayOfFolders[0].subFolders.length > 0) {
+        if (arrayOfFolders.length === 0) {
+          return undefined;
+        } else if (arrayOfFolders[0].subFolders.length > 0) {
           return "^ Add base folder";
         } else {
           return arrayOfFolders[0].name;
@@ -174,13 +169,38 @@ function checkFilters(filters) {
       }
     }
 
-      for (let i = 0; i < newFilters.length; ++i) {
+    if (filters[0].folder.accountName === undefined) {
-        newFilters[i].folder.accountName =
+      //  Old format, convert
-          accountNames[newFilters[i].folder.accountId];
+
-        newFilters[i].folder.name = findFolder(
+      console.log("Converting old filters");
-          newFilters[i].folder.accountId,
+
-          newFilters[i].folder.path
+      //  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) {
+          continue;
+        }
+
+        //  Account still active
+        filter.folder.accountName = accountName;
+
+        const name = findFolder(filter.folder.accountId, filter.folder.path);
+        if (name === undefined) {
+          continue;
+        }
+
+        //  Folder still active
+        filter.folder.name = name;
+
+        //  Store the new filter
+        newFilters.push(filter);
       }
 
       //
@@ -189,6 +209,43 @@ function checkFilters(filters) {
       browser.storage.sync.set({
         filters: newFilters,
       });
+    } else {
+      // Need to check if the accounts still exist
+
+      //  Create an id -> name map
+      accountNames = {};
+      for (const account of SysTrayX.Messaging.accounts) {
+        accountNames[account.id] = account.name;
+      }
+
+      let filtersChanged = false;
+      for (let i = 0; i < filters.length; ++i) {
+        let filter = filters[i];
+
+        const accountName = accountNames[filter.folder.accountId];
+        if (accountName === undefined) {
+          let filtersChanged = true;
+          continue;
+        }
+
+        const name = findFolder(filter.folder.accountId, filter.folder.path);
+        if (name === undefined) {
+          let filtersChanged = true;
+          continue;
+        }
+
+        //  Store the new filter
+        newFilters.push(filter);
+      }
+
+      if (filtersChanged) {
+        //
+        //  Store the converted filters
+        //
+        browser.storage.sync.set({
+          filters: newFilters,
+        });
+      }
     }
   }
 
@@ -200,11 +257,11 @@ function checkFilters(filters) {
 //
 async function getFilters() {
   function getFiltersCb(result) {
-    let filters = result.filters || undefined;
+    const filters = result.filters || undefined;
 
-    filters = checkFilters(filters);
+    const newFilters = checkFilters(filters);
 
-    return filters;
+    return newFilters;
   }
 
   function onFiltersError() {