Merge pull request #4 from micz/no_experiment

micz · web-flow · commit 774e75fad02f · 2025-06-28T14:24:47.000+02:00
Experiment API removed
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@
 
 
 
+<h2>Version 2.0.0 - ??/??/2025</h2>
+      <ul>
+        <li>This addons is now a pure mail extension, so the full permission is no more needed.</li>
+        <li>SentAutoMove is now compatible only on Thunderbird 128 and above.</li>
+        <li>Force destination folder update option removed.</li>
+      </ul>
 <h2>Version 1.0.2 - 14/01/2025</h2>
   <ul>
     <li>Fixed a bug when using Thunderbird 128 searching a related message: skip it if it's content is not available in Thunderbird and it's not possibile to download it.</li>
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -397,14 +397,6 @@
     "message": "Thunderbird has gone offline. Moving messages in bulk within IMAP accounts while offline is not recommended. The operation has been stopped.",
     "description": ""
   },
-  "prefs_OptionText_imap_force_folder_update": {
-    "message": "Force IMAP folder update",
-    "description": ""
-  },
-  "prefs_OptionText_imap_force_folder_update_info": {
-    "message": "Force an update of the destination folder, after a message move, when using an IMAP account.",
-    "description": ""
-  },
   "Idle" : {
     "message": "Idle",
     "description": ""
diff --git a/api/ImapTools/implementation.js b/api/ImapTools/implementation.js
diff --git a/api/ImapTools/schema.json b/api/ImapTools/schema.json
diff --git a/js/mzsam-moving-engine.js b/js/mzsam-moving-engine.js
@@ -64,14 +64,8 @@ export class movingEngine {
   async checkFolder(folder){
     let query_params = {}
 
-    if(samStore.istb128orgreater){
-      query_params = {
-        folderId: folder.id,
-      }
-    }else{
-      query_params = {
-        folder: folder,
-      }
+    query_params = {
+      folderId: folder.id,
     }
     
     this.logger.log("Checking folder [" + folder.name + "]");
@@ -87,7 +81,6 @@ export class movingEngine {
       this.logger.changeDebug(samStore.do_debug);
 
       let operation_aborted = false;
-      let imap_force_folder_update = samPrefs.getPref("imap_force_folder_update");
 
       let report_data = {};
       report_data.report_date = new Date();
@@ -107,7 +100,7 @@ export class movingEngine {
 
       let folder_string = browser.i18n.getMessage("executedFromSelection");
       if(query_params !== null){
-        folder_string = samStore.istb128orgreater ? (await messenger.folders.get(query_params.folderId)).name : query_params.folder.name;
+        folder_string = (await messenger.folders.get(query_params.folderId)).name;
       }
 
       report_data.current_folder = folder_string;
@@ -180,7 +173,7 @@ export class movingEngine {
           if(dest_folder !== false){
             // console.log(">>>>>>>>>>>> dest_folder: " + JSON.stringify(dest_folder));
             // ================================ The following line has to be commented out for testing ================================
-            await this.doMessagesMove([message.id], dest_folder, imap_force_folder_update);
+            await this.doMessagesMove([message.id], dest_folder);
             // ========================================================================================================================
             tot_moved++;
             this.logger.log("Moving [" + message.subject + "] to [" + dest_folder.name + "] [" + message.headerMessageId + "] [" + samUtils.formatDateString(message.date) + "]");
@@ -252,23 +245,12 @@ export class movingEngine {
       }
   }
 
-  async doMessagesMove(messageIds, dest_folder, force_folder_update = true){
+  async doMessagesMove(messageIds, dest_folder){
     this.logger.log("Start moving messages: " + JSON.stringify(messageIds));
     this.logger.log("Destination folder: " + JSON.stringify(dest_folder));
     await messenger.messages.move(messageIds, samUtils.getParameter(dest_folder)).catch((err) => {
       this.logger.error("Error moving message [" + message.subject + "] [" + message.headerMessageId + "]: " + err);
     });
-    if(force_folder_update){
-      this.logger.log("Messasegs moved, waiting for destination folder update...");
-      try{
-      await browser.ImapTools.forceServerUpdate(dest_folder.accountId, dest_folder.path);
-      }catch(err){
-        this.logger.error("Error updating destination folder: " + err);
-      }
-      this.logger.log("Destination folder updated.");
-    }else{
-      this.logger.log("Not forcing a destination folder update.");
-    }
   }
 
   // this method finds the message related to the one passed to it
@@ -295,12 +277,8 @@ export class movingEngine {
       let found_messages = null;
       //only from this account
       if(this.do_only_same_account){
-        if(samStore.istb128orgreater){  //TB128
-          //query_params.accountId = samUtils.getFolderAccountId(message.folder);
-          query_params.folderId = await samUtils.getAccountFoldersIds(samUtils.getFolderAccountId(message.folder), this.ignore_archives_folders);
-        }else{  // TB 115
-          found_messages = this.getAccountMessages(query_params, account_id);
-        }
+        //query_params.accountId = samUtils.getFolderAccountId(message.folder);
+        query_params.folderId = await samUtils.getAccountFoldersIds(samUtils.getFolderAccountId(message.folder), this.ignore_archives_folders);
       }
 
       if(found_messages == null) found_messages = this.getMessages(messenger.messages.query(query_params));
@@ -330,12 +308,8 @@ export class movingEngine {
         let found_messages = null;
         //only from this account
         if(this.do_only_same_account){
-          if(samStore.istb128orgreater){  //TB128
-            //query_params.accountId = samUtils.getFolderAccountId(message.folder);
-            query_params.folderId = await samUtils.getAccountFoldersIds(samUtils.getFolderAccountId(message.folder), this.ignore_archives_folders);
-          }else{  // TB 115
-            found_messages = this.getAccountMessages(query_params, account_id);
-          }
+          //query_params.accountId = samUtils.getFolderAccountId(message.folder);
+          query_params.folderId = await samUtils.getAccountFoldersIds(samUtils.getFolderAccountId(message.folder), this.ignore_archives_folders);
         }
 
         if(found_messages == null) found_messages = this.getMessages(messenger.messages.query(query_params));
@@ -379,12 +353,8 @@ export class movingEngine {
           let found_messages = null;
           //only from this account
           if(this.do_only_same_account){
-            if(samStore.istb128orgreater){  //TB128
-              //query_params.accountId = samUtils.getFolderAccountId(message.folder);
-              query_params.folderId = await samUtils.getAccountFoldersIds(samUtils.getFolderAccountId(message.folder), this.ignore_archives_folders);
-            }else{  // TB 115
-              found_messages = this.getAccountMessages(query_params, account_id);
-            }
+            //query_params.accountId = samUtils.getFolderAccountId(message.folder);
+            query_params.folderId = await samUtils.getAccountFoldersIds(samUtils.getFolderAccountId(message.folder), this.ignore_archives_folders);
           }
 
           if(found_messages == null) found_messages = this.getMessages(messenger.messages.query(query_params));
diff --git a/js/mzsam-options-default.js b/js/mzsam-options-default.js
@@ -15,5 +15,4 @@ export const prefs_default = {
     'pause_every_10_messages': 1000,
     'warn_before_run': true,
     '_internal__ask_empty_prefix_done': false,
-    'imap_force_folder_update': true,
 }
diff --git a/js/mzsam-store.js b/js/mzsam-store.js
@@ -19,7 +19,6 @@
 
 export const samStore = {
     'do_debug': false,
-    'istb128orgreater': false,
     
     async setOnline(value) {
         await samStore.setSessionData("tbOnline", value);
diff --git a/js/mzsam-utils.js b/js/mzsam-utils.js
@@ -24,18 +24,6 @@ export const samUtils = {
 
   regexEmail: /[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/,
 
-  async isThunderbird128OrGreater(){
-      try {
-        const info = await browser.runtime.getBrowserInfo();
-        const version = info.version;
-        return samUtils.compareThunderbirdVersions(version, '128.0') >= 0;
-      } catch (error) {
-        console.error('[SentAutoMove] Error retrieving browser information:', error);
-        return false;
-      }
-    },
-
-
   compareThunderbirdVersions(v1, v2) {
       const v1parts = v1.split('.').map(Number);
       const v2parts = v2.split('.').map(Number);
@@ -225,11 +213,7 @@ export const samUtils = {
   },
 
   getParameter(param){
-    if(samStore.istb128orgreater){
-      return param.id;
-    }else{
-      return param;
-    }
+    return param.id;
   },
 
   extractInviteSubject(inputString) {
diff --git a/manifest.json b/manifest.json
@@ -2,14 +2,13 @@
     "manifest_version": 2,
     "name": "SentAutoMove",
     "description": "__MSG_extensionDescription__",
-    "version": "1.0.2",
+    "version": "2.0.0",
     "author": "Mic (m@micz.it)",
     "homepage_url": "https://micz.it/thunderbird-addon-sentautomove/",
     "browser_specific_settings": {
         "gecko": {
             "id": "sentautomove@micz.it",
-            "strict_min_version": "115.0",
-            "strict_max_version": "136.*"
+            "strict_min_version": "128.0"
         }
     },
     "permissions": [
@@ -37,15 +36,5 @@
         "default_title": "SentAutoMove",
         "default_icon": "images/icon-32px.png",
         "default_popup": "popup/mzsam-popup.html"
-    },
-    "experiment_apis": {
-        "ImapTools": {
-            "schema": "api/ImapTools/schema.json",
-            "parent": {
-                "scopes": ["addon_parent"],
-                "paths": [["ImapTools"]],
-                "script": "api/ImapTools/implementation.js"
-            }
-        }
     }
 }
diff --git a/mzsam-background.js b/mzsam-background.js
@@ -39,7 +39,6 @@ import { samLogger } from "./js/mzsam-logger.js";
 //     movingEngine.movedMessagesListener(originalMessages, movedMessages);
 // });
 
-samStore.istb128orgreater = await samUtils.isThunderbird128OrGreater();
 samStore.do_debug = await samPrefs.getPref("do_debug");
 let samLog = new samLogger("mzsam-background", samStore.do_debug);
 
diff --git a/options/mzsam-options.html b/options/mzsam-options.html
@@ -174,17 +174,6 @@
             </label>
           </td>
         </tr>
-        <tr>
-          <td><label>
-            <span>__MSG_prefs_OptionText_imap_force_folder_update__</span>
-          </label></td>
-          <td>
-            <label>
-              <input type="checkbox" id="imap_force_folder_update" name="imap_force_folder_update" class="option-input" />
-              <span>__MSG_prefs_OptionText_imap_force_folder_update_info__</span>
-            </label>
-          </td>
-        </tr>
         <tr>
           <td><label>
             <span>__MSG_prefs_OptionText_do_debug__</span>
diff --git a/options/mzsam-release-notes.html b/options/mzsam-release-notes.html
diff --git a/report/mzsam-report-page.js b/report/mzsam-report-page.js

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,4 @@ export const prefs_default = {`
`15`	`15`	`'pause_every_10_messages': 1000,`
`16`	`16`	`'warn_before_run': true,`
`17`	`17`	`'_internal__ask_empty_prefix_done': false,`
`18`		`- 'imap_force_folder_update': true,`
`19`	`18`	`}`