diff options
Diffstat (limited to 'src/assets')
-rw-r--r-- | src/assets/javascripts/reddit.js | 8 | ||||
-rw-r--r-- | src/assets/javascripts/search.js | 8 | ||||
-rw-r--r-- | src/assets/javascripts/tiktok.js | 4 | ||||
-rw-r--r-- | src/assets/javascripts/translate/get_lingva_preferences.js | 10 | ||||
-rw-r--r-- | src/assets/javascripts/translate/set_lingva_preferences.js | 2 | ||||
-rw-r--r-- | src/assets/javascripts/translate/translate.js | 27 | ||||
-rw-r--r-- | src/assets/javascripts/twitter.js | 4 | ||||
-rw-r--r-- | src/assets/javascripts/utils.js | 10 | ||||
-rw-r--r-- | src/assets/javascripts/wikipedia.js | 4 | ||||
-rw-r--r-- | src/assets/javascripts/youtube/youtube.js | 48 |
10 files changed, 86 insertions, 39 deletions
diff --git a/src/assets/javascripts/reddit.js b/src/assets/javascripts/reddit.js index 4b9ee721..ce55bb83 100644 --- a/src/assets/javascripts/reddit.js +++ b/src/assets/javascripts/reddit.js @@ -119,7 +119,7 @@ function initLibredditCookies(test, from) { }) } -function setLibredditCookies() { +function pasteLibredditCookies() { return new Promise(async resolve => { await init(); if (disableReddit || redditFrontend != 'libreddit' || redditProtocol === undefined) { resolve(); return; } @@ -172,7 +172,7 @@ function initTedditCookies(test, from) { }) } -function setTedditCookies() { +function pasteTedditCookies() { return new Promise(async resolve => { await init(); if (disableReddit || redditFrontend != 'teddit' || redditProtocol === undefined) { resolve(); return; } @@ -361,9 +361,9 @@ function initDefaults() { export default { setRedirects, initLibredditCookies, - setLibredditCookies, + pasteLibredditCookies, initTedditCookies, - setTedditCookies, + pasteTedditCookies, redirect, initDefaults, diff --git a/src/assets/javascripts/search.js b/src/assets/javascripts/search.js index 76d50161..227eba86 100644 --- a/src/assets/javascripts/search.js +++ b/src/assets/javascripts/search.js @@ -175,7 +175,7 @@ function initSearxCookies(test, from) { }) } -function setSearxCookies() { +function pasteSearxCookies() { return new Promise(async resolve => { await init(); if (disableSearch || searchFrontend != 'searx') { resolve(); return; } @@ -245,7 +245,7 @@ function initSearxngCookies(test, from) { }) } -function setSearxngCookies() { +function pasteSearxngCookies() { return new Promise(async resolve => { await init(); if (disableSearch || searchFrontend != 'searxng', searchProtocol === undefined) { resolve(); return; } @@ -453,9 +453,9 @@ function initDefaults() { export default { setRedirects, initSearxCookies, - setSearxCookies, + pasteSearxCookies, initSearxngCookies, - setSearxngCookies, + pasteSearxngCookies, redirect, initDefaults, switchInstance, diff --git a/src/assets/javascripts/tiktok.js b/src/assets/javascripts/tiktok.js index 39245ec4..05370b67 100644 --- a/src/assets/javascripts/tiktok.js +++ b/src/assets/javascripts/tiktok.js @@ -49,7 +49,7 @@ function initProxiTokCookies(test, from) { }) } -function setProxiTokCookies() { +function pasteProxiTokCookies() { return new Promise(async resolve => { await init(); if (disableTiktok || tiktokProtocol === undefined) { resolve(); return; } @@ -166,7 +166,7 @@ export default { reverse, initProxiTokCookies, - setProxiTokCookies, + pasteProxiTokCookies, initDefaults }; diff --git a/src/assets/javascripts/translate/get_lingva_preferences.js b/src/assets/javascripts/translate/get_lingva_preferences.js index f04ea3dc..40def6a5 100644 --- a/src/assets/javascripts/translate/get_lingva_preferences.js +++ b/src/assets/javascripts/translate/get_lingva_preferences.js @@ -2,9 +2,11 @@ window.browser = window.browser || window.chrome; browser.storage.local.set( { - ['lingva_lingva_chakra-ui-color-mode']: localStorage.getItem('chakra-ui-color-mode'), - lingva_lingva_isauto: localStorage.getItem('isauto'), - lingva_lingva_source: localStorage.getItem('source'), - lingva_lingva_target: localStorage.getItem('target'), + ['lingva_chakra-ui-color-mode']: localStorage.getItem('chakra-ui-color-mode'), + lingva_isauto: localStorage.getItem('isauto'), + lingva_source: localStorage.getItem('source'), + lingva_target: localStorage.getItem('target'), } ) + +console.log(localStorage.getItem('target')); \ No newline at end of file diff --git a/src/assets/javascripts/translate/set_lingva_preferences.js b/src/assets/javascripts/translate/set_lingva_preferences.js index 01a3b85e..a0f2ad87 100644 --- a/src/assets/javascripts/translate/set_lingva_preferences.js +++ b/src/assets/javascripts/translate/set_lingva_preferences.js @@ -10,10 +10,8 @@ browser.storage.local.get( r => { if (r['lingva_chakra-ui-color-mode'] !== undefined) localStorage.setItem('chakra-ui-color-mode', r['lingva_chakra-ui-color-mode']); if (r.lingva_isauto !== undefined) localStorage.setItem('isauto', r.lingva_isauto); - console.log('r.lingva_isauto', r.lingva_isauto, localStorage.getItem('isauto')) if (r.lingva_source !== undefined) localStorage.setItem('source', r.lingva_source); if (r.lingva_target !== undefined) localStorage.setItem('target', r.lingva_target); - window.close(); } ) diff --git a/src/assets/javascripts/translate/translate.js b/src/assets/javascripts/translate/translate.js index bc93ec6c..0dccc848 100644 --- a/src/assets/javascripts/translate/translate.js +++ b/src/assets/javascripts/translate/translate.js @@ -94,7 +94,7 @@ function setRedirects(val) { }) } -function initLingvaLocalStorage(test, url, tabId) { +function copyPasteLingvaLocalStorage(test, url, tabId) { return new Promise(async resolve => { await init(); if (translateDisable || translateFrontend != 'lingva') { resolve(); return; } @@ -129,7 +129,21 @@ function initLingvaLocalStorage(test, url, tabId) { ) } -function initSimplyTranslateCookies(test, from) { +function pasteLingvaLocalStorage() { + return new Promise(async resolve => { + await init(); + if (translateDisable || translateFrontend != 'lingva') { resolve(); return; } + let checkedInstances; + if (translateProtocol == 'normal') checkedInstances = [...lingvaNormalRedirectsChecks, ...lingvaNormalCustomRedirects]; + if (translateProtocol == 'tor') checkedInstances = [...lingvaTorRedirectsChecks, ...lingvaTorCustomRedirects]; + for (const to of checkedInstances) + browser.tabs.create({ url: to }, + tab => browser.tabs.executeScript(tab.id, { file: "/assets/javascripts/translate/set_lingva_preferences.js", runAt: "document_start" })) + resolve(); + }) +} + +function copyPasteSimplyTranslateCookies(test, from) { return new Promise(async resolve => { await init(); const protocolHost = utils.protocolHost(from); @@ -153,7 +167,7 @@ function initSimplyTranslateCookies(test, from) { ) } -function setSimplyTranslateCookies() { +function pasteSimplyTranslateCookies() { return new Promise(async resolve => { await init(); if (translateDisable || translateFrontend != 'simplyTranslate') { resolve(); return; } @@ -281,9 +295,10 @@ function initDefaults() { } export default { - initSimplyTranslateCookies, - setSimplyTranslateCookies, - initLingvaLocalStorage, + copyPasteSimplyTranslateCookies, + pasteSimplyTranslateCookies, + copyPasteLingvaLocalStorage, + pasteLingvaLocalStorage, setRedirects, redirect, initDefaults, diff --git a/src/assets/javascripts/twitter.js b/src/assets/javascripts/twitter.js index eb969739..1cc57cbf 100644 --- a/src/assets/javascripts/twitter.js +++ b/src/assets/javascripts/twitter.js @@ -170,7 +170,7 @@ function initNitterCookies(test, from) { }) } -function setNitterCookies() { +function pasteNitterCookies() { return new Promise(async resolve => { await init(); if (disableTwitter || twitterProtocol === undefined) { resolve(); return; } @@ -231,6 +231,6 @@ export default { reverse, removeXFrameOptions, initNitterCookies, - setNitterCookies, + pasteNitterCookies, initDefaults, }; diff --git a/src/assets/javascripts/utils.js b/src/assets/javascripts/utils.js index a957121b..fd306b0c 100644 --- a/src/assets/javascripts/utils.js +++ b/src/assets/javascripts/utils.js @@ -382,9 +382,9 @@ function unify(test) { try { url = new URL(currTab.url); } catch { resolve(); return; } - let result = await youtubeHelper.initInvidiousCookies(test, url); - if (!result) result = await youtubeHelper.initPipedLocalStorage(test, url, currTab.id); - if (!result) result = await youtubeHelper.initPipedMaterialLocalStorage(test, url, currTab.id); + let result = await youtubeHelper.copyPasteInvidiousCookies(test, url); + if (!result) result = await youtubeHelper.copyPastePipedLocalStorage(test, url, currTab.id); + if (!result) result = await youtubeHelper.copyPastePipedMaterialLocalStorage(test, url, currTab.id); if (!result) result = await twitterHelper.initNitterCookies(test, url); @@ -398,8 +398,8 @@ function unify(test) { if (!result) result = await wikipediaHelper.initWikilessCookies(test, url); - if (!result) result = await translateHelper.initSimplyTranslateCookies(test, url); - if (!result) result = await translateHelper.initLingvaLocalStorage(test, url); + if (!result) result = await translateHelper.copyPasteSimplyTranslateCookies(test, url); + if (!result) result = await translateHelper.copyPasteLingvaLocalStorage(test, url); if (result) { resolve(true); diff --git a/src/assets/javascripts/wikipedia.js b/src/assets/javascripts/wikipedia.js index dc71fad5..96e96bce 100644 --- a/src/assets/javascripts/wikipedia.js +++ b/src/assets/javascripts/wikipedia.js @@ -97,7 +97,7 @@ function initWikilessCookies(test, from) { }) } -function setWikilessCookies() { +function pasteWikilessCookies() { return new Promise(async resolve => { await init(); if (disableWikipedia || wikipediaProtocol === undefined) { resolve(); return; } @@ -207,7 +207,7 @@ export default { setRedirects, initWikilessCookies, - setWikilessCookies, + pasteWikilessCookies, redirect, initDefaults, diff --git a/src/assets/javascripts/youtube/youtube.js b/src/assets/javascripts/youtube/youtube.js index cbdb0c6b..aeb2e760 100644 --- a/src/assets/javascripts/youtube/youtube.js +++ b/src/assets/javascripts/youtube/youtube.js @@ -298,7 +298,7 @@ function initDefaults() { }) } -function initInvidiousCookies(test, from) { +function copyPasteInvidiousCookies(test, from) { return new Promise(async resolve => { await init(); if (disableYoutube || youtubeFrontend != 'invidious') { resolve(); return; } @@ -321,7 +321,7 @@ function initInvidiousCookies(test, from) { }) } -function setInvidiousCookies() { +function pasteInvidiousCookies() { return new Promise(async resolve => { await init(); if (disableYoutube || youtubeFrontend != 'invidious') { resolve(); return; } @@ -333,7 +333,7 @@ function setInvidiousCookies() { }) } -function initPipedLocalStorage(test, url, tabId) { +function copyPastePipedLocalStorage(test, url, tabId) { return new Promise(async resolve => { await init(); if (disableYoutube || youtubeFrontend != 'piped') { resolve(); return; } @@ -361,8 +361,22 @@ function initPipedLocalStorage(test, url, tabId) { resolve(true); }) } +function pastePipedLocalStorage() { + return new Promise(async resolve => { + await init(); + if (disableYoutube || youtubeFrontend != 'piped') { resolve(); return; } + let checkedInstances; + if (youtubeProtocol == 'normal') checkedInstances = [...pipedNormalCustomRedirects, ...pipedNormalRedirectsChecks] + else if (youtubeProtocol == 'tor') checkedInstances = [...pipedTorRedirectsChecks, ...pipedTorCustomRedirects] + for (const to of checkedInstances) { + browser.tabs.create({ url: to }, + tab => browser.tabs.executeScript(tab.id, { file: "/assets/javascripts/youtube/set_piped_preferences.js", runAt: "document_start" })) + } + resolve(); + }) +} -function initPipedMaterialLocalStorage(test, url, tabId,) { +function copyPastePipedMaterialLocalStorage(test, url, tabId,) { return new Promise(async resolve => { await init(); if (disableYoutube || youtubeFrontend != 'pipedMaterial') { resolve(); return; } @@ -392,6 +406,22 @@ function initPipedMaterialLocalStorage(test, url, tabId,) { }) } +function pastePipedMaterialLocalStorage() { + return new Promise(async resolve => { + await init(); + if (disableYoutube || youtubeFrontend != 'pipedMaterial') { resolve(); return; } + let checkedInstances; + if (youtubeProtocol == 'normal') checkedInstances = [...pipedMaterialNormalRedirectsChecks, ...pipedMaterialNormalCustomRedirects] + else if (youtubeProtocol == 'tor') checkedInstances = [...pipedMaterialTorRedirectsChecks, ...pipedMaterialTorCustomRedirects] + for (const to of checkedInstances) { + browser.tabs.create({ url: to }, + tab => browser.tabs.executeScript(tab.id, { file: "/assets/javascripts/youtube/set_pipedMaterial_preferences.js", runAt: "document_start" })) + } + resolve(); + }) +} + + function removeXFrameOptions(e) { if (e.type != 'sub_frame') return; const url = new URL(e.url); @@ -409,10 +439,12 @@ function removeXFrameOptions(e) { export default { setRedirects, - initPipedLocalStorage, - initPipedMaterialLocalStorage, - initInvidiousCookies, - setInvidiousCookies, + copyPastePipedLocalStorage, + pastePipedLocalStorage, + copyPastePipedMaterialLocalStorage, + pastePipedMaterialLocalStorage, + copyPasteInvidiousCookies, + pasteInvidiousCookies, redirect, reverse, switchInstance, |