diff --git a/js/mzta-utils.js b/js/mzta-utils.js index dca1a52a..9b932ac0 100644 --- a/js/mzta-utils.js +++ b/js/mzta-utils.js @@ -349,17 +349,6 @@ export function i18nConditionalGet(str) { 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) { const v1parts = v1.split('.').map(Number); const v2parts = v2.split('.').map(Number); @@ -385,12 +374,9 @@ export function generateCallID(length = 10) { export async function getTagsList(){ let messageTags = []; - if(await isThunderbird128OrGreater()) { - // without the tags related permissions, we can't get the tags list - messageTags = await browser.messages.tags.list(); - } else { - messageTags = await browser.messages.listTags(); - } + // without the tags related permissions, we can't get the tags list + messageTags = await browser.messages.tags.list(); + const output = messageTags.map(tag => tag.tag).join(', '); 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); try { 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()); - }else{ - return browser.messages.createTag(tagKey, tag, generateHexColorForTag()); - } + return browser.messages.tags.create(tagKey, tag, generateHexColorForTag()); } catch (error) { console.error('[ThunderAI] Error creating tag:', error); } diff --git a/options/mzta-options.js b/options/mzta-options.js index 5e73c23d..10d09874 100644 --- a/options/mzta-options.js +++ b/options/mzta-options.js @@ -21,7 +21,6 @@ import { taLogger } from '../js/mzta-logger.js'; import { ChatGPTWeb_models, checkSparksPresence, - isThunderbird128OrGreater, openTab, getChatGPTWebModelsList_HTML, isAPIKeyValue, @@ -35,7 +34,6 @@ import { } from '../pages/_lib/connection-ui.js'; let taLog = new taLogger("mzta-options",true); -let _isThunderbird128OrGreater = true; function saveOptions(e) { e.preventDefault(); @@ -228,8 +226,6 @@ document.addEventListener('DOMContentLoaded', async () => { varConnectionUI.permission_all_urls = await messenger.permissions.contains({ origins: [""] }) - _isThunderbird128OrGreater = await isThunderbird128OrGreater(); - // show Owl warning const accountList = await messenger.accounts.list(false); if(accountList.some(account => account.type.toLowerCase().includes('owl'))) { @@ -248,11 +244,7 @@ document.addEventListener('DOMContentLoaded', async () => { async function _addtags_el_change() { if (event.target.checked) { let granted = false; - if(_isThunderbird128OrGreater){ - granted = await messenger.permissions.request({ permissions: ["messagesTags", "messagesUpdate"] }); - }else{ - granted = await messenger.permissions.request({ permissions: ["messagesTags"] }); - } + granted = await messenger.permissions.request({ permissions: ["messagesTags", "messagesUpdate"] }); if (!granted) { event.target.checked = false; addtags_info_btn.disabled = 'disabled'; diff --git a/pages/customdataplaceholders/mzta-custom-dataplaceholders.js b/pages/customdataplaceholders/mzta-custom-dataplaceholders.js index 2c2e896a..a6b5a5f4 100644 --- a/pages/customdataplaceholders/mzta-custom-dataplaceholders.js +++ b/pages/customdataplaceholders/mzta-custom-dataplaceholders.js @@ -17,9 +17,20 @@ */ 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 { 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"; let prefs = null; @@ -550,12 +561,8 @@ async function setStorageSpace() { document.getElementById('storage_space').textContent = storage_space; } - -if(await isThunderbird128OrGreater()){ - window.addEventListener('beforeunload', function (event) { - // Check if any changes have been made (Only for Thunderbird 128+ see https://github.com/micz/ThunderAI/issues/88) - if (somethingChanged) { - event.preventDefault(); - } - }); -} \ No newline at end of file +window.addEventListener('beforeunload', function (event) { + if (somethingChanged) { + event.preventDefault(); + } +}); diff --git a/pages/customprompts/mzta-custom-prompts.js b/pages/customprompts/mzta-custom-prompts.js index 9ce27807..70386374 100644 --- a/pages/customprompts/mzta-custom-prompts.js +++ b/pages/customprompts/mzta-custom-prompts.js @@ -34,7 +34,6 @@ import { } from "../../pages/_lib/connection-ui.js"; import { ChatGPTWeb_models, - isThunderbird128OrGreater, getLocalStorageUsedSpace, sanitizeHtml, validateCustomData_ChatGPTWeb, @@ -1214,14 +1213,11 @@ async function setStorageSpace() { } -if(await isThunderbird128OrGreater()){ - window.addEventListener('beforeunload', function (event) { - // Check if any changes have been made (Only for Thunderbird 128+ see https://github.com/micz/ThunderAI/issues/88) - if (somethingChanged) { - event.preventDefault(); - } - }); -} +window.addEventListener('beforeunload', function (event) { + if (somethingChanged) { + event.preventDefault(); + } +}); async function checkPromptsConfigForPlaceholders(textarea){ let curr_text = textarea.value;