From 04fcac392067c28a875648bcc3ac234d6ed05b05 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Wed, 9 Mar 2022 22:52:58 +0300 Subject: Added autoRedirect off offline instances option --- src/pages/background/background.js | 46 ++++++++++++++++++++++++++++++++++ src/pages/errors/instance_offline.html | 29 +++++++++++++++++++++ src/pages/errors/instance_offline.js | 2 ++ src/pages/options/general/general.html | 5 ++++ src/pages/options/general/general.js | 7 +++++- src/pages/popup/popup.js | 4 +-- 6 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 src/pages/errors/instance_offline.html create mode 100644 src/pages/errors/instance_offline.js (limited to 'src/pages') diff --git a/src/pages/background/background.js b/src/pages/background/background.js index cf893143..f93944e4 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -110,6 +110,52 @@ browser.tabs.onRemoved.addListener((tabId) => { } }); + + + + +browser.webRequest.onResponseStarted.addListener( + details => { + console.log("onResponseStarted"); + let autoRedirect = generalHelper.getAutoRedirect(); + + if (!autoRedirect) return null; + + if (details.statusCode >= 500) { + + const url = new URL(details.url); + let newUrl; + + newUrl = youtubeHelper.changeInstance(url); + + if (!newUrl) newUrl = twitterHelper.changeInstance(url); + + if (!newUrl) newUrl = instagramHelper.changeInstance(url); + + if (!newUrl) newUrl = redditHelper.changeInstance(url); + + if (!newUrl) newUrl = searchHelper.changeInstance(url); + + if (!newUrl) newUrl = translateHelper.changeInstance(url); + + if (!newUrl) newUrl = mediumHelper.changeInstance(url); + + if (!newUrl) newUrl = imgurHelper.changeInstance(url); + + if (!newUrl) newUrl = wikipediaHelper.changeInstance(url) + + if (newUrl) { + browser.tabs.update({ url: '../errors/instance_offline.html' }); + + setTimeout(() => browser.tabs.update({ url: newUrl }), 2000); + } + + + } + }, + { urls: [""], } +) + browser.tabs.onUpdated.addListener( (tabId, changeInfo, _) => { let url; diff --git a/src/pages/errors/instance_offline.html b/src/pages/errors/instance_offline.html new file mode 100644 index 00000000..7536b3c2 --- /dev/null +++ b/src/pages/errors/instance_offline.html @@ -0,0 +1,29 @@ + + + + + + + + Instance is offline + + + + + + + This instance is offline, you'll be redirected after 2 seconds + + + + + \ No newline at end of file diff --git a/src/pages/errors/instance_offline.js b/src/pages/errors/instance_offline.js new file mode 100644 index 00000000..586585d6 --- /dev/null +++ b/src/pages/errors/instance_offline.js @@ -0,0 +1,2 @@ +setTimeout(() => document.getElementById("number").innerHTML = '1', 1000); +setTimeout(() => document.getElementById("number").innerHTML = '0', 2000); \ No newline at end of file diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html index fcee2089..acacc59f 100644 --- a/src/pages/options/general/general.html +++ b/src/pages/options/general/general.html @@ -109,6 +109,11 @@ +
+

Auto Redirect of offline instances

+ +
+

Exceptions

diff --git a/src/pages/options/general/general.js b/src/pages/options/general/general.js index f65fa290..54a1fd19 100644 --- a/src/pages/options/general/general.js +++ b/src/pages/options/general/general.js @@ -62,6 +62,11 @@ alwaysUsePreferredElement.addEventListener("change", event => generalHelper.setAlwaysUsePreferred(event.target.checked) ); +let autoRedirectElement = document.getElementById("auto-redirect") +autoRedirectElement.addEventListener("change", + event => generalHelper.setAutoRedirect(event.target.checked) +); + let applyThemeToSitesElement = document.getElementById("apply-theme-to-sites") applyThemeToSitesElement.addEventListener("change", event => generalHelper.setApplyThemeToSites(event.target.checked) @@ -92,7 +97,7 @@ for (const frontend of generalHelper.allPopupFrontends) generalHelper.init().then(() => { alwaysUsePreferredElement.checked = generalHelper.getAlwaysUsePreferred(); - console.log("alwaysUsePreferredElement.checked", alwaysUsePreferredElement.checked); + autoRedirectElement.checked = generalHelper.getAutoRedirect(); themeElement.value = generalHelper.getTheme(); applyThemeToSitesElement.checked = generalHelper.getApplyThemeToSites(); instanceTypeElement.addEventListener("change", diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index 5d7a690d..e8ff1f3a 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -164,11 +164,9 @@ let popupFrontends; generalHelper.init().then(() => { popupFrontends = generalHelper.getPopupFrontends(); - for (const frontend of generalHelper.allPopupFrontends) { - console.log(frontend) + for (const frontend of generalHelper.allPopupFrontends) if (!popupFrontends.includes(frontend)) document.getElementById(frontend).classList.add("hide") else document.getElementById(frontend).classList.remove("hide") - } }); \ No newline at end of file -- cgit 1.4.1