Disable spam score column on Supernova

Depends on: https://bugzilla.mozilla.org/show_bug.cgi?id=1817682
moisseev · Jul 29, 2023 · 41c9a19 · 41c9a19
1 parent 3453f21
commit 41c9a19
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 1 deletion.
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -121,6 +121,9 @@
     "spamnessOptions.captionDisplayColumnGroup.label": {
         "message": "Column display"
     },
+    "spamnessOptions.columnDisplayGroup.note": {
+        "message": "The feature is incompatible with this Thunderbird version. Supported versions: 78.0 - 110.*."
+    },
     "spamnessOptions.captionDisplayMessageGroup.label": {
         "message": "Message display"
     },

diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
@@ -117,6 +117,9 @@
     "spamnessOptions.captionDisplayColumnGroup.label": {
         "message": "Настройка отображения колонки"
     },
+    "spamnessOptions.columnDisplayGroup.note": {
+        "message": "Функция несовместима с этой версией Thunderbird. Поддерживаемые версии: 78.0 - 110.*."
+    },
     "spamnessOptions.captionDisplayMessageGroup.label": {
         "message": "Настройки отображения сообщения"
     },

diff --git a/experiments/scoreColumn.js b/experiments/scoreColumn.js
@@ -7,6 +7,7 @@
 var {ExtensionCommon} = ChromeUtils.import("resource://gre/modules/ExtensionCommon.jsm");
 var {ExtensionSupport} = ChromeUtils.import("resource:///modules/ExtensionSupport.jsm");
 var Services = globalThis.Services || ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
+var [majorVersion] = Services.appinfo.platformVersion.split(".", 1);
 /* eslint-enable no-var */
 
 const RspamdSpamnessColumn = {};
@@ -89,6 +90,8 @@ var scoreColumn = class extends ExtensionCommon.ExtensionAPI {
                     return Services.prefs.getCharPref(prefName);
                 },
                 init() {
+                    if (majorVersion > 110) return;
+
                     // Listen for the main Thunderbird windows opening.
                     ExtensionSupport.registerWindowListener("scoreColumnListener", {
                         chromeURLs: ["chrome://messenger/content/messenger.xhtml"],
@@ -161,6 +164,8 @@ var scoreColumn = class extends ExtensionCommon.ExtensionAPI {
 
     // eslint-disable-next-line class-methods-use-this
     close() {
+        if (majorVersion > 110) return;
+
         libExperiments.removeElements([
             "spamScoreCol",
             "rspamd-spamness-messenger-css"

diff --git a/options/options.css b/options/options.css
@@ -11,3 +11,13 @@ input[type="radio"],
 label {
     vertical-align: middle;
 }
+#column-display-fieldset {
+    display: flex;
+    flex-direction: column;
+}
+#column-display-note {
+    color: black;
+    background-color: #ffe900;
+    border-radius: 4px;
+    padding: 4px 8px;
+}
diff --git a/options/options.html b/options/options.html
@@ -28,8 +28,9 @@
 
     <div class="addon-detail-row" id="spamnessOptionsWindow">
         <form>
-            <fieldset>
+            <fieldset id="column-display-fieldset">
                 <legend class="groupbox-title">__MSG_spamnessOptions.captionDisplayColumnGroup.label__</legend>
+                <div id="column-display-note" hidden>__MSG_spamnessOptions.columnDisplayGroup.note__</div>
                 <div role="radiogroup">
                     <p>
                         <input type="radio" name="columnDisplay" id="columnDisplay_both" value="both">

diff --git a/options/options.js b/options/options.js
@@ -3,6 +3,14 @@
 "use strict";
 
 async function init() {
+    browser.runtime.getBrowserInfo().then((browserInfo) => {
+        const [majorVersion] = browserInfo.version.split(".", 1);
+        if (majorVersion > 110) {
+            document.querySelector("#column-display-fieldset").disabled = true;
+            document.querySelector("#column-display-note").removeAttribute("hidden");
+        }
+    });
+
     const localStorage = await browser.storage.local.get(libBackground.defaultOptions.keys);
 
     document.querySelector("#columnDisplay_" + localStorage["display-column"]).checked = true;