Merge https://github.com/libredirect/libredirect

1 files changed, 1 insertions, 68 deletions

diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 3a695048..33f0d40b 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -89,47 +89,9 @@ browser.tabs.onRemoved.addListener(tabId => {
 	}
 })
 
-async function redirectOfflineInstance(url, tabId) {
-	let newUrl = await servicesHelper.switchInstance(url, true)
-
-	if (newUrl) {
-		if (counter >= 5) {
-			browser.tabs.update(tabId, {
-				url: `/pages/errors/instance_offline.html?url=${encodeURIComponent(newUrl)}`,
-			})
-			counter = 0
-		} else {
-			browser.tabs.update(tabId, { url: newUrl })
-			counter++
-		}
-	}
-}
-let counter = 0
-
-function isAutoRedirect() {
-	return new Promise(resolve => browser.storage.local.get("options", r => resolve(r.options.autoRedirect == true)))
-}
-
-browser.webRequest.onResponseStarted.addListener(
-	async details => {
-		if (!(await isAutoRedirect())) return null
-		if (details.type == "main_frame" && details.statusCode >= 500) redirectOfflineInstance(new URL(details.url), details.tabId)
-	},
-	{ urls: ["<all_urls>"] }
-)
-
-browser.webRequest.onErrorOccurred.addListener(
-	async details => {
-		if (!(await isAutoRedirect())) return
-		if (details.type == "main_frame") redirectOfflineInstance(new URL(details.url), details.tabId)
-	},
-	{ urls: ["<all_urls>"] }
-)
-
 browser.commands.onCommand.addListener(command => {
 	if (command === "switchInstance") utils.switchInstance()
 	else if (command == "copyRaw") utils.copyRaw()
-	else if (command == "unify") utils.unify()
 })
 
 browser.contextMenus.create({
@@ -151,26 +113,6 @@ browser.contextMenus.create({
 })
 
 browser.contextMenus.create({
-	id: "unify",
-	title: browser.i18n.getMessage("unifySettings"),
-	contexts: ["browser_action"],
-})
-
-try {
-	browser.contextMenus.create({
-		id: "toggleTab",
-		title: browser.i18n.getMessage("toggleTab"),
-		contexts: ["page", "tab"],
-	})
-} catch {
-	browser.contextMenus.create({
-		id: "toggleTab",
-		title: browser.i18n.getMessage("toggleTab"),
-		contexts: ["page"],
-	})
-}
-
-browser.contextMenus.create({
 	id: "redirectLink",
 	title: browser.i18n.getMessage("redirectLink"),
 	contexts: ["link"],
@@ -207,10 +149,6 @@ browser.contextMenus.onClicked.addListener((info, tab) => {
 				utils.copyRaw()
 				resolve()
 				return
-			case "unify":
-				utils.unify()
-				resolve()
-				return
 			case "toggleTab":
 				if (tabIdRedirects[tab.id] != undefined) {
 					tabIdRedirects[tab.id] = !tabIdRedirects[tab.id]
@@ -253,9 +191,4 @@ browser.webRequest.onHeadersReceived.addListener(
 	},
 	{ urls: ["<all_urls>"] },
 	["blocking", "responseHeaders"]
-)
-
-browser.runtime.onMessage.addListener((message, sender, sendResponse) => {
-	if (message.function === "unify") utils.unify(false).then(r => sendResponse({ response: r }))
-	return true
-})
+)
\ No newline at end of file