removed all the 115 and 128 related methods and calls. see #616

This commit is contained in:
mic 2026-01-30 22:31:19 +01:00
parent bae2e0f012
commit 5348cdc25e
4 changed files with 28 additions and 51 deletions

View file

@ -349,17 +349,6 @@ export function i18nConditionalGet(str) {
return str; // Return the original string if the conditions are not met return str; // Return the original string if the conditions are not met
} }
export async function isThunderbird128OrGreater(){
try {
const info = await browser.runtime.getBrowserInfo();
const version = info.version;
return compareThunderbirdVersions(version, '128.0') >= 0;
} catch (error) {
console.error('[ThunderAI] Error retrieving browser information:', error);
return false;
}
}
function compareThunderbirdVersions(v1, v2) { function compareThunderbirdVersions(v1, v2) {
const v1parts = v1.split('.').map(Number); const v1parts = v1.split('.').map(Number);
const v2parts = v2.split('.').map(Number); const v2parts = v2.split('.').map(Number);
@ -385,12 +374,9 @@ export function generateCallID(length = 10) {
export async function getTagsList(){ export async function getTagsList(){
let messageTags = []; let messageTags = [];
if(await isThunderbird128OrGreater()) { // without the tags related permissions, we can't get the tags list
// without the tags related permissions, we can't get the tags list messageTags = await browser.messages.tags.list();
messageTags = await browser.messages.tags.list();
} else {
messageTags = await browser.messages.listTags();
}
const output = messageTags.map(tag => tag.tag).join(', '); const output = messageTags.map(tag => tag.tag).join(', ');
const output2 = messageTags.reduce((acc, messageTag) => { const output2 = messageTags.reduce((acc, messageTag) => {
@ -411,11 +397,7 @@ export async function createTag(tag) {
if(prefs_tag.add_tags_first_uppercase) tag = tag.toLowerCase().charAt(0).toUpperCase() + tag.toLowerCase().slice(1); if(prefs_tag.add_tags_first_uppercase) tag = tag.toLowerCase().charAt(0).toUpperCase() + tag.toLowerCase().slice(1);
try { try {
const tagKey = '$ta-' + generateCallID(16) + '-' + sanitizeString(tag); // Ensure uniqueness with a longer random ID const tagKey = '$ta-' + generateCallID(16) + '-' + sanitizeString(tag); // Ensure uniqueness with a longer random ID
if(await isThunderbird128OrGreater()) { return browser.messages.tags.create(tagKey, tag, generateHexColorForTag());
return browser.messages.tags.create(tagKey, tag, generateHexColorForTag());
}else{
return browser.messages.createTag(tagKey, tag, generateHexColorForTag());
}
} catch (error) { } catch (error) {
console.error('[ThunderAI] Error creating tag:', error); console.error('[ThunderAI] Error creating tag:', error);
} }

View file

@ -21,7 +21,6 @@ import { taLogger } from '../js/mzta-logger.js';
import { import {
ChatGPTWeb_models, ChatGPTWeb_models,
checkSparksPresence, checkSparksPresence,
isThunderbird128OrGreater,
openTab, openTab,
getChatGPTWebModelsList_HTML, getChatGPTWebModelsList_HTML,
isAPIKeyValue, isAPIKeyValue,
@ -35,7 +34,6 @@ import {
} from '../pages/_lib/connection-ui.js'; } from '../pages/_lib/connection-ui.js';
let taLog = new taLogger("mzta-options",true); let taLog = new taLogger("mzta-options",true);
let _isThunderbird128OrGreater = true;
function saveOptions(e) { function saveOptions(e) {
e.preventDefault(); e.preventDefault();
@ -228,8 +226,6 @@ document.addEventListener('DOMContentLoaded', async () => {
varConnectionUI.permission_all_urls = await messenger.permissions.contains({ origins: ["<all_urls>"] }) varConnectionUI.permission_all_urls = await messenger.permissions.contains({ origins: ["<all_urls>"] })
_isThunderbird128OrGreater = await isThunderbird128OrGreater();
// show Owl warning // show Owl warning
const accountList = await messenger.accounts.list(false); const accountList = await messenger.accounts.list(false);
if(accountList.some(account => account.type.toLowerCase().includes('owl'))) { if(accountList.some(account => account.type.toLowerCase().includes('owl'))) {
@ -248,11 +244,7 @@ document.addEventListener('DOMContentLoaded', async () => {
async function _addtags_el_change() { async function _addtags_el_change() {
if (event.target.checked) { if (event.target.checked) {
let granted = false; let granted = false;
if(_isThunderbird128OrGreater){ granted = await messenger.permissions.request({ permissions: ["messagesTags", "messagesUpdate"] });
granted = await messenger.permissions.request({ permissions: ["messagesTags", "messagesUpdate"] });
}else{
granted = await messenger.permissions.request({ permissions: ["messagesTags"] });
}
if (!granted) { if (!granted) {
event.target.checked = false; event.target.checked = false;
addtags_info_btn.disabled = 'disabled'; addtags_info_btn.disabled = 'disabled';

View file

@ -17,9 +17,20 @@
*/ */
import { prefs_default } from "../../options/mzta-options-default.js"; import { prefs_default } from "../../options/mzta-options-default.js";
import { getLocalStorageUsedSpace, sanitizeHtml, isThunderbird128OrGreater, openTab } from "../../js/mzta-utils.js"; import {
getLocalStorageUsedSpace,
sanitizeHtml,
openTab
} from "../../js/mzta-utils.js";
import { taLogger } from "../../js/mzta-logger.js"; import { taLogger } from "../../js/mzta-logger.js";
import { getPlaceholders, setCustomPlaceholders, getCustomPlaceholders, prepareCustomDataPHsForExport, prepareCustomDataPHsForImport, placeholdersUtils } from "../../js/mzta-placeholders.js"; import {
getPlaceholders,
setCustomPlaceholders,
getCustomPlaceholders,
prepareCustomDataPHsForExport,
prepareCustomDataPHsForImport,
placeholdersUtils
} from "../../js/mzta-placeholders.js";
import { textareaAutocomplete } from "../../js/mzta-placeholders-autocomplete.js"; import { textareaAutocomplete } from "../../js/mzta-placeholders-autocomplete.js";
let prefs = null; let prefs = null;
@ -550,12 +561,8 @@ async function setStorageSpace() {
document.getElementById('storage_space').textContent = storage_space; document.getElementById('storage_space').textContent = storage_space;
} }
window.addEventListener('beforeunload', function (event) {
if(await isThunderbird128OrGreater()){ if (somethingChanged) {
window.addEventListener('beforeunload', function (event) { event.preventDefault();
// Check if any changes have been made (Only for Thunderbird 128+ see https://github.com/micz/ThunderAI/issues/88) }
if (somethingChanged) { });
event.preventDefault();
}
});
}

View file

@ -34,7 +34,6 @@ import {
} from "../../pages/_lib/connection-ui.js"; } from "../../pages/_lib/connection-ui.js";
import { import {
ChatGPTWeb_models, ChatGPTWeb_models,
isThunderbird128OrGreater,
getLocalStorageUsedSpace, getLocalStorageUsedSpace,
sanitizeHtml, sanitizeHtml,
validateCustomData_ChatGPTWeb, validateCustomData_ChatGPTWeb,
@ -1214,14 +1213,11 @@ async function setStorageSpace() {
} }
if(await isThunderbird128OrGreater()){ window.addEventListener('beforeunload', function (event) {
window.addEventListener('beforeunload', function (event) { if (somethingChanged) {
// Check if any changes have been made (Only for Thunderbird 128+ see https://github.com/micz/ThunderAI/issues/88) event.preventDefault();
if (somethingChanged) { }
event.preventDefault(); });
}
});
}
async function checkPromptsConfigForPlaceholders(textarea){ async function checkPromptsConfigForPlaceholders(textarea){
let curr_text = textarea.value; let curr_text = textarea.value;