From 41e145bf7a63fc0a181370005f780d5e85f72e83 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Sat, 26 Feb 2022 01:31:48 +0300 Subject: Made auto changing instances manual #59 --- src/pages/background/background.js | 90 +----------------------- src/pages/options/general/general.html | 8 ++- src/pages/options/general/general.js | 5 ++ src/pages/options/imgur/imgur.html | 2 +- src/pages/options/instagram/instagram.html | 2 +- src/pages/options/maps/maps.html | 2 +- src/pages/options/medium/medium.html | 2 +- src/pages/options/reddit/reddit.html | 2 +- src/pages/options/reddit/reddit.js | 4 +- src/pages/options/search/search.html | 2 +- src/pages/options/tiktok/tiktok.html | 2 +- src/pages/options/translate/translate.html | 4 +- src/pages/options/twitter/twitter.html | 6 +- src/pages/options/wikipedia/wikipedia.html | 2 +- src/pages/options/youtube/youtube.html | 2 +- src/pages/options/youtubeMusic/youtubeMusic.html | 2 +- src/pages/popup/popup.html | 17 +++-- src/pages/popup/popup.js | 35 +++++++++ src/pages/popup/style.css | 2 +- src/pages/stylesheets/styles.css | 14 ++-- 20 files changed, 87 insertions(+), 118 deletions(-) (limited to 'src/pages') diff --git a/src/pages/background/background.js b/src/pages/background/background.js index 1f91ad4d..50b054ec 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -90,96 +90,8 @@ browser.webRequest.onBeforeRequest.addListener( ["blocking"] ); -browser.webRequest.onResponseStarted.addListener( - (responseDetails) => { - let url = new URL(responseDetails.url); - let protocolHost = `${url.protocol}//${url.host}`; - var mightyList = getMightyList(); - - if (mightyList.includes(protocolHost)); { - if (responseDetails.statusCode >= 500 && responseDetails.type === "main_frame") { - console.log("Instance is corrupted, redirecting", responseDetails.url); - changeInstance(responseDetails.url); - } - } - }, - { urls: [""] } -); - browser.tabs.onUpdated.addListener( (tabId, changeInfo) => { if (changeInfo.url && youtubeHelper.isUrlPipedorInvidious(changeInfo.url)) youtubeHelper.invidiousInitCookies(tabId); - }); - -function changeInstance(url) { - var tabUrl = new URL(url); - var protocolHost = `${tabUrl.protocol}//${tabUrl.host}`; - var newUrl; - - console.log("wewe") - newUrl = youtubeHelper.changeInstance(url); - - let twitterList = [...twitterHelper.getRedirects().nitter.normal]; - if (twitterList.includes(protocolHost) && twitterList.length > 1) newUrl = 'https://twitter.com'; - - let instagramList = [...instagramHelper.getRedirects().bibliogram.normal]; - if (instagramList.includes(protocolHost) && instagramList.length > 1) newUrl = 'https://instagram.com'; - - let redditList = [...redditHelper.getRedirects().libreddit.normal, ...redditHelper.getRedirects().teddit.normal] - if (redditList.includes(protocolHost) && redditList.length > 1) { - if (tabUrl.pathname.startsWith('/img')) { - newUrl = "https://i.redd.it" - tabUrl.href = tabUrl.href.replace("/img", "") - } - else - newUrl = 'https://reddit.com'; - } - - let searchList = [...searchHelper.getRedirects().searx.normal, ...searchHelper.getRedirects().whoogle.normal] - if (searchList.includes(protocolHost) && searchList.length > 1) newUrl = 'https://google.com'; - - let translateList = [...translateHelper.getRedirects().simplyTranslate.normal, ...translateHelper.getRedirects().lingva.normal] - if (translateList.includes(protocolHost) && translateList.length > 1) newUrl = 'https://translate.google.com'; - - let mediumList = [...mediumHelper.getRedirects().scribe.normal] - if (mediumList.includes(protocolHost) && mediumList.length > 1) newUrl = 'https://medium.com'; - - let imgurList = [...imgurHelper.getRedirects().rimgo.normal]; - if (imgurList.includes(protocolHost) && imgurList.length > 1) newUrl = 'https://imgur.com'; - - let wikipediaList = [...wikipediaHelper.getRedirects().wikiless.normal] - if (wikipediaList.includes(protocolHost) && wikipediaList.length > 1) newUrl = 'https://wikipedia.com'; - - if (newUrl) browser.tabs.update({ url: tabUrl.href.replace(protocolHost, newUrl) }); -} - -function getMightyList() { - return [ - ...youtubeHelper.getCustomRedirects().invidious.normal, - ...youtubeHelper.getCustomRedirects().piped.normal, - - ...twitterHelper.getCustomRedirects().nitter.normal, - - ...youtubeMusicHelper.getCustomRedirects().beatbump.normal, - - ...instagramHelper.getCustomRedirects().bibliogram.normal, - - ...redditHelper.getCustomRedirects().libreddit.normal, - ...redditHelper.getCustomRedirects().teddit.normal, - redditHelper.getCustomRedirects().desktop, - redditHelper.getCustomRedirects().mobile, - - ...searchHelper.getCustomRedirects().searx.normal, - ...searchHelper.getCustomRedirects().whoogle.normal, - - ...translateHelper.getCustomRedirects().simplyTranslate.normal, - ...translateHelper.getCustomRedirects().lingva.normal, - - ...mediumHelper.getCustomRedirects().scribe.normal, - - ...imgurHelper.getCustomRedirects().rimgo.normal, - - ...wikipediaHelper.getCustomRedirects().wikiless.normal - ]; -} + }); \ No newline at end of file diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html index d86dacd2..9cb247ef 100644 --- a/src/pages/options/general/general.html +++ b/src/pages/options/general/general.html @@ -23,7 +23,7 @@ YouTube
- + YT Music
@@ -126,6 +126,12 @@
+ +

Exceptions

diff --git a/src/pages/options/general/general.js b/src/pages/options/general/general.js index 7fa85a3a..2796bba1 100644 --- a/src/pages/options/general/general.js +++ b/src/pages/options/general/general.js @@ -31,6 +31,11 @@ document.querySelector("#update-instances").addEventListener("click", () => { else document.querySelector("#update-instances").innerHTML = 'Failed Miserabely'; }); + +document.querySelector("#export-settings").addEventListener("click", () => { + browser.storage.local.get(null, result => console.log(result)) +}); + let nameCustomInstanceInput = document.getElementById("exceptions-custom-instance"); let instanceTypeElement = document.getElementById("exceptions-custom-instance-type"); let instanceType = "url" diff --git a/src/pages/options/imgur/imgur.html b/src/pages/options/imgur/imgur.html index 35e7707b..65c35b64 100644 --- a/src/pages/options/imgur/imgur.html +++ b/src/pages/options/imgur/imgur.html @@ -24,7 +24,7 @@ YouTube
- + YT Music
diff --git a/src/pages/options/instagram/instagram.html b/src/pages/options/instagram/instagram.html index 2d4b79c5..a4f33a7c 100644 --- a/src/pages/options/instagram/instagram.html +++ b/src/pages/options/instagram/instagram.html @@ -25,7 +25,7 @@ YouTube
- + YT Music
diff --git a/src/pages/options/maps/maps.html b/src/pages/options/maps/maps.html index 2fedc4d3..8a07b50f 100644 --- a/src/pages/options/maps/maps.html +++ b/src/pages/options/maps/maps.html @@ -25,7 +25,7 @@ YouTube
- + YT Music
diff --git a/src/pages/options/medium/medium.html b/src/pages/options/medium/medium.html index 5cdd223b..69fff984 100644 --- a/src/pages/options/medium/medium.html +++ b/src/pages/options/medium/medium.html @@ -24,7 +24,7 @@ YouTube
- + YT Music
diff --git a/src/pages/options/reddit/reddit.html b/src/pages/options/reddit/reddit.html index 4da143c5..fce58192 100644 --- a/src/pages/options/reddit/reddit.html +++ b/src/pages/options/reddit/reddit.html @@ -24,7 +24,7 @@ YouTube
- + YT Music
diff --git a/src/pages/options/reddit/reddit.js b/src/pages/options/reddit/reddit.js index 549822a5..ac629e44 100644 --- a/src/pages/options/reddit/reddit.js +++ b/src/pages/options/reddit/reddit.js @@ -23,7 +23,7 @@ let redditFrontendElement = document.getElementById("reddit-frontend"); redditFrontendElement.addEventListener("change", (event) => { let frontend = event.target.options[redditFrontendElement.selectedIndex].value - redditHelper.setRedditFrontend(frontend) + redditHelper.setFrontend(frontend) changeFrontendsSettings(frontend); } ); @@ -60,7 +60,7 @@ function changeProtocolSettings(protocol) { redditHelper.init().then(() => { disableRedditElement.checked = !redditHelper.getDisableReddit(); - let frontend = redditHelper.getRedditFrontend(); + let frontend = redditHelper.getFrontend(); redditFrontendElement.value = frontend; changeFrontendsSettings(frontend); diff --git a/src/pages/options/search/search.html b/src/pages/options/search/search.html index 81ac9f0c..91f1069f 100644 --- a/src/pages/options/search/search.html +++ b/src/pages/options/search/search.html @@ -24,7 +24,7 @@ YouTube
- + YT Music
diff --git a/src/pages/options/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html index 77dc5d95..42b99330 100644 --- a/src/pages/options/tiktok/tiktok.html +++ b/src/pages/options/tiktok/tiktok.html @@ -24,7 +24,7 @@ YouTube
- + YT Music
diff --git a/src/pages/options/translate/translate.html b/src/pages/options/translate/translate.html index 2240bc3b..a51b459e 100644 --- a/src/pages/options/translate/translate.html +++ b/src/pages/options/translate/translate.html @@ -19,12 +19,12 @@ General
-
+
YouTube
- + YT Music
diff --git a/src/pages/options/twitter/twitter.html b/src/pages/options/twitter/twitter.html index 304ccecc..b5ff73ce 100644 --- a/src/pages/options/twitter/twitter.html +++ b/src/pages/options/twitter/twitter.html @@ -20,12 +20,12 @@ General
-
+
YouTube
- + YT Music
@@ -186,4 +186,4 @@ - + \ No newline at end of file diff --git a/src/pages/options/wikipedia/wikipedia.html b/src/pages/options/wikipedia/wikipedia.html index 53d46df4..d76480ef 100644 --- a/src/pages/options/wikipedia/wikipedia.html +++ b/src/pages/options/wikipedia/wikipedia.html @@ -24,7 +24,7 @@ YouTube
- + YT Music
diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html index 0fb4f195..4aa75f22 100644 --- a/src/pages/options/youtube/youtube.html +++ b/src/pages/options/youtube/youtube.html @@ -25,7 +25,7 @@ YouTube
- + YT Music
diff --git a/src/pages/options/youtubeMusic/youtubeMusic.html b/src/pages/options/youtubeMusic/youtubeMusic.html index bf98692b..d9b8b89b 100644 --- a/src/pages/options/youtubeMusic/youtubeMusic.html +++ b/src/pages/options/youtubeMusic/youtubeMusic.html @@ -25,7 +25,7 @@ YouTube
- + YT Music
diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html index fca93ab4..93d9d19c 100644 --- a/src/pages/popup/popup.html +++ b/src/pages/popup/popup.html @@ -152,15 +152,22 @@
+ +
+ + Change Instance  + + + + - Settings  + Settings  - - - +
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index dfbee60b..9c5f28f3 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -109,3 +109,38 @@ disableMediumElement.addEventListener("change", document.getElementById("more-options").addEventListener("click", () => browser.runtime.openOptionsPage() ); + +document.getElementById("change-instance").addEventListener("click", + () => browser.tabs.query({ active: true, currentWindow: true }, function (tabs) { + let currTab = tabs[0]; + if (currTab) { + changeInstance(currTab.url) + } + }) +); + +function changeInstance(url) { + var tabUrl = new URL(url); + var protocolHost = `${tabUrl.protocol}//${tabUrl.host}`; + var newUrl; + + newUrl = youtubeHelper.changeInstance(tabUrl); + + if (!newUrl) newUrl = twitterHelper.changeInstance(tabUrl); + + if (!newUrl) newUrl = instagramHelper.changeInstance(tabUrl); + + if (!newUrl) newUrl = redditHelper.changeInstance(tabUrl); + + if (!newUrl) newUrl = searchHelper.changeInstance(tabUrl); + + if (!newUrl) newUrl = translateHelper.changeInstance(tabUrl); + + if (!newUrl) newUrl = mediumHelper.changeInstance(tabUrl); + + if (!newUrl) newUrl = imgurHelper.changeInstance(tabUrl); + + if (!newUrl) newUrl = wikipediaHelper.changeInstance(tabUrl) + + if (newUrl) browser.tabs.update({ url: tabUrl.href.replace(protocolHost, newUrl) }); +} diff --git a/src/pages/popup/style.css b/src/pages/popup/style.css index f223ec52..477035bb 100644 --- a/src/pages/popup/style.css +++ b/src/pages/popup/style.css @@ -1,4 +1,4 @@ body { - width: 230px; + width: 240px; min-height: auto; } \ No newline at end of file diff --git a/src/pages/stylesheets/styles.css b/src/pages/stylesheets/styles.css index 6293184f..ab300d4a 100644 --- a/src/pages/stylesheets/styles.css +++ b/src/pages/stylesheets/styles.css @@ -17,6 +17,7 @@ body { font-family: Sans-Serif; background-color: var(--bg-main); color: var(--text); + overflow-x:hidden } div.some-block input[type="checkbox"] { @@ -60,9 +61,9 @@ select { border-radius: 3px; } -a.button * { +/* a.button * { vertical-align: middle; -} +} */ a.button:hover { background-color: var(--active); @@ -209,19 +210,22 @@ div.some-block input[type="checkbox"]:checked::before { div.buttons { margin-bottom: 15px; + margin-top: 15px; } a.button { stroke: var(--text); - display: block; + display: flex; + justify-content: center; + align-items: center; border-radius: 5px; border: var(--active) solid 1px; color: var(--text); font-size: 12px; font-weight: bold; - margin: 7.5px 15px; + /* width: 180px; */ + margin: 8px 20px; padding: 10px; - text-align: center; text-decoration: none; cursor: pointer; transition-duration: 0.1s; -- cgit 1.4.1