fix: Make use of built-in folder query methods

Author: kewisch

src/api/api.js

@@ -29,7 +29,8 @@ this.quickmove = class extends ExtensionAPI {
     return {
       quickmove: {
         // bug 1840039 - messenger.folders.query API
-        // Keeping this around as this verison allows us to switch between MRMTime and MRUTime
+        // bug 1945514 - allow differing between MRU/MRMTime
+        // TB136 COMPAT
         async query({ recent, limit, canFileMessages }) {
           function* allFolders(root) {
             if (

src/popup/popup.js

@@ -32,6 +32,9 @@ function switchList(action) {
 }
 
 async function load() {
+  let browserInfo = await browser.runtime.getBrowserInfo();
+  let majorVersion = parseInt(browserInfo.version.split(".")[0], 10);
+
   let fontSize = await messenger.quickmove.getUIFontSize();
   window.document.documentElement.style.setProperty("font-size", `${fontSize}px`);
 
@@ -129,7 +132,20 @@ async function load() {
   let defaultFolders;
 
   if (defaultFolderSetting == "recent") {
-    let folderList = await browser.quickmove.query({ recent: recentStrategy, limit: maxRecentFolders, canFileMessages: true });
+    let folderList;
+    if (majorVersion < 137) {
+      // TB136 COMPAT
+      folderList = await browser.quickmove.query({ recent: recentStrategy, limit: maxRecentFolders, canFileMessages: true });
+    } else {
+      let lastProperty = recentStrategy == "modified" ? "lastUsedAsDestination" : "lastUsed";
+      folderList = await browser.folders.query({
+        limit: browser.folder.DEFAULT_MOST_RECENT_LIMIT,
+        [lastProperty]: { recent: true },
+        sort: lastProperty,
+        canAddMessages: true
+      });
+    }
+
     defaultFolders = rootNode.fromList(folderList).folderNodes;
   } else if (defaultFolderSetting == "specific") {
     defaultFolders = await getValidatedFolders(rootNode, "defaultFolders");