diff --git a/src/SEQTA.ts b/src/SEQTA.ts index d395cd0f..c2966463 100644 --- a/src/SEQTA.ts +++ b/src/SEQTA.ts @@ -62,16 +62,14 @@ async function init() { enableCurrentTheme() try { - const items = await browser.storage.local.get() as SettingsState - - if (items.onoff) { + if (settingsState.onoff) { const injectedStyle = document.createElement('style') injectedStyle.textContent = injectedCSS document.head.appendChild(injectedStyle) } - main(items) + main() } catch (error: any) { onError(error) } @@ -97,10 +95,8 @@ export function enableAnimatedBackground() { export async function HideMenuItems(): Promise { try { - const result = await browser.storage.local.get() as SettingsState - let stylesheetInnerText: string = '' - for (const [menuItem, { toggle }] of Object.entries(result.menuitems)) { + for (const [menuItem, { toggle }] of Object.entries(settingsState.menuitems)) { if (!toggle) { stylesheetInnerText += SetDisplayNone(menuItem) console.log(`[BetterSEQTA+] Hiding ${menuItem} menu item`) @@ -312,20 +308,15 @@ async function finishLoad() { console.error("Error during loading cleanup:", err); } - try { - const { justupdated } = await browser.storage.local.get('justupdated'); - if (justupdated && !document.getElementById('whatsnewbk')) { - OpenWhatsNewPopup(); - } - } catch (error) { - console.error("Error retrieving 'justupdated' from storage:", error); + if (settingsState.justupdated && !document.getElementById('whatsnewbk')) { + OpenWhatsNewPopup(); } } async function DeleteWhatsNew() { const bkelement = document.getElementById('whatsnewbk') const popup = document.getElementsByClassName('whatsnewContainer')[0] - + animate( [popup, bkelement!], { opacity: [1, 0], scale: [1, 0] }, @@ -441,8 +432,7 @@ async function updateIframesWithDarkMode(): Promise { if (node.nodeName === 'IFRAME') { const iframe = node as HTMLIFrameElement try { - const settings = await browser.storage.local.get('DarkMode') as SettingsState - applyDarkModeToIframe(iframe, cssLink, settings.DarkMode); + applyDarkModeToIframe(iframe, cssLink, settingsState.DarkMode); } catch (error) { console.error('Error applying dark mode:', error) } @@ -514,7 +504,7 @@ function SortMessagePageItems(messagesParentElement: any) { } async function LoadPageElements(): Promise { - await AddBetterSEQTAElements(true) + await AddBetterSEQTAElements() const sublink: string | undefined = window.location.href.split('/')[4] const observer = new MutationObserver(function (mutations_list) { @@ -597,11 +587,9 @@ async function LoadPageElements(): Promise { async function handleNewsPage(): Promise { console.log('[BetterSEQTA+] Started Init') - const settings: SettingsState = await browser.storage.local.get() as SettingsState - if (settings.onoff) { + if (settingsState.onoff) { SendNewsPage() - const notificationSettings: SettingsState = await browser.storage.local.get() as SettingsState - if (notificationSettings.notificationcollector) { + if (settingsState.notificationcollector) { enableNotificationCollector() } finishLoad() @@ -610,8 +598,7 @@ async function LoadPageElements(): Promise { async function handleDefault(): Promise { finishLoad() - const settings: SettingsState = await browser.storage.local.get() as SettingsState - if (settings.notificationcollector) { + if (settingsState.notificationcollector) { enableNotificationCollector() } } @@ -718,55 +705,51 @@ function ChangeMenuItemPositions(storage: any) { } export async function ObserveMenuItemPosition() { - const result = browser.storage.local.get() - function open (result: any) { - let menuorder = result.menuorder - if (menuorder && result.onoff) { - const observer = new MutationObserver(function (mutations_list) { - mutations_list.forEach(function (mutation) { - mutation.addedNodes.forEach(function (added_node) { - const node = added_node as HTMLElement - if (!node?.dataset?.checked && !MenuOptionsOpen) { - const key = MenuitemSVGKey[node?.dataset?.key! as keyof typeof MenuitemSVGKey] - if (key) { - ReplaceMenuSVG( - node, - MenuitemSVGKey[node.dataset.key as keyof typeof MenuitemSVGKey], - ) - } else if (node?.firstChild?.nodeName === 'LABEL') { - // Assuming `node` is an
  • element containing a
  • element containing a