+ Tab whitelist

background.js

@@ -1,3 +1,5 @@
+let tabWhitelist = [];
+
 // Einstellungen ziehen, ContentScript registrieren
 browser.storage.local.get(
 	{
@@ -25,9 +27,26 @@ async function registerCS(url) {
 
 // pageAction anzeigen
 browser.runtime.onMessage.addListener((data, sender) => {
-	if (data.type == "showPageAction") {
+	if (data.type == "showYoutubePageAction") {
-		browser.pageAction.show(sender.tab.id);
+		browser.pageAction.setIcon({
+			tabId: sender.tab.id,
+			path: "icons/youtube.png"
+		});
+		browser.pageAction.setTitle({
+			tabId: sender.tab.id,
+			title: "Open on YouTube"
+		});
+	} else if (data.type == "showInvidiousPageAction") {
+		browser.pageAction.setIcon({
+			tabId: sender.tab.id,
+			path: "icons/invidious.png"
+		});
+		browser.pageAction.setTitle({
+			tabId: sender.tab.id,
+			title: "Open on Invidious"
+		});
 	}
+	browser.pageAction.show(sender.tab.id);
 })
 
 // Storage onChange listener
@@ -64,6 +83,7 @@ function deactivateBlocker() {
 
 // Redirect
 browser.webRequest.onBeforeRequest.addListener(async (details) => {
+	if (!tabWhitelist.includes(details.tabId)) {
 
 		let activated;
 		let instance;
@@ -95,8 +115,8 @@ browser.webRequest.onBeforeRequest.addListener(async (details) => {
 				return { redirectUrl: "https://" + instance + "/embed/" + details.url.split("/embed/")[1] };
 			}
 		}
+	}
 },
-
 	{
 		urls: ['*://*.youtube.com/*', '*://*.youtu.be/*', '*://*.youtube-nocookie.com/*']
 	},
@@ -104,18 +124,27 @@ browser.webRequest.onBeforeRequest.addListener(async (details) => {
 	['blocking']
 );
 
-// URL Icon Click --> Open on YouTube
+// URL Icon Click --> Open on YouTube/Invidious
-browser.pageAction.onClicked.addListener((details) => {
+browser.pageAction.onClicked.addListener((tab) => {
-	browser.storage.local.get("activated").then((item) => {
+	browser.storage.local.get({ activated: true, instance: "yewtu.be" }).then(async (storage) => {
-		if (item.activated) {
+		if (tab.url.startsWith("https://www.youtube.com")) {
-			deactivateBlocker();
-			setTimeout(() => {
-				activateBlocker();
-			}, 10000);
-		}
-
 			browser.tabs.create({
-			url: "https://www.youtube.com/" + details.url.split("/")[3]
+				url: "https://" + storage.instance + "/" + tab.url.split("/")[3]
+			});
+		} else {
+			let newTab = await browser.tabs.create({
+				url: "https://www.youtube.com/" + tab.url.split("/")[3]
+			});
+			if (!tabWhitelist.includes(newTab.id)) {
+				tabWhitelist.push(newTab.id);
+			}
+		}
 	});
 });
+
+// Close tab -> Remove from whitelist
+browser.tabs.onRemoved.addListener((tabId) => {
+	if (tabWhitelist.includes(tabId)) {
+		tabWhitelist.splice(tabWhitelist.indexOf(tabId), 1);
+	}
 });

content.js

@@ -1 +1,5 @@
-browser.runtime.sendMessage({ type: "showPageAction" });
+if (location.href.startsWith("https://www.youtube.com")) {
+    browser.runtime.sendMessage({ type: "showInvidiousPageAction" });
+} else {
+    browser.runtime.sendMessage({ type: "showYoutubePageAction" });
+}

manifest.json

@@ -2,30 +2,37 @@
   "manifest_version": 2,
   "name": "InviTube",
   "author": "Indogermane",
-  "version": "1.0",
+  "version": "1.1",
   "description": "Redirect YouTube to Invidious.",
   "background": {
-    "scripts": ["background.js"]
+    "scripts": [
+      "background.js"
+    ]
   },
-  
   "options_ui": {
     "page": "options/options.html"
   },
-  
   "icons": {
     "800": "icons/Icon.png"
   },
-
   "browser_action": {
     "browser_style": true,
     "default_icon": "icons/invidious.png"
   },
-  
   "page_action": {
     "default_icon": "icons/youtube.png",
     "default_title": "Open on YouTube"
   },
-
+  "content_scripts": [
+    {
+      "matches": [
+        "https://www.youtube.com/*"
+      ],
+      "js": [
+        "content.js"
+      ]
+    }
+  ],
   "permissions": [
     "webRequest",
     "webRequestBlocking",
@@ -33,7 +40,6 @@
     "storage",
     "tabs"
   ],
-  
   "browser_specific_settings": {
     "gecko": {
       "id": "InviTube@Indogermane",