README.md

@@ -1,7 +1,2 @@
 # youtube-to-invidious
-
+WebExtention to redirect every youtube link to a invidious instance
-[Available here](https://addons.mozilla.org/en-US/firefox/addon/youtube-to-invidious/)
-
-WebExtention to redirect every youtube link to a [Invidious](https://invidious.io/) instance.
-
-The instance url can be configured in the add-on settings.

background.js

@@ -1,5 +1,3 @@
-let urlFromStorage
-
 // Storage init
 browser.runtime.onInstalled.addListener(function() {
   browser.storage.sync.set({
@@ -7,12 +5,6 @@ browser.runtime.onInstalled.addListener(function() {
   });
 });
 
-browser.storage.sync.onChanged.addListener(function(changes) {
-  if (changes.url && changes.url.newValue) {
-    urlFromStorage = changes.url.newValue
-  }
-})
-
 
 // Url format
 function getVideoToken(url) {
@@ -33,11 +25,12 @@ function cleanToken(token) {
 }
 
 
-
+// Links click event handling
-function toInvidious(message) {
+browser.runtime.onMessage.addListener(function(message) {
-  let url = message.url;
+  let url = message.youtubeUrl;
   const name = message.targetName;
-  const subst = urlFromStorage + `/watch?v=`;
+  browser.storage.sync.get("url").then(function(item) {
+    const subst = item.url + `/watch?v=`;
     let token = getVideoToken(url)
       const cleanedToken = cleanToken(token)
       url = url.replace(/.*\/watch\?v=/gm, subst);
@@ -48,20 +41,9 @@ function toInvidious(message) {
         );
       } else {
         browser.tabs.update(
-      {url: url, loadReplace: false}
+          {url: url, loadReplace: true}
         )
       }
       console.log('Youtube to invidious is redirecting you to invidious')
-}
+  })
-
-
-// Links click event handling
-browser.runtime.onMessage.addListener(function(message) {
-  toInvidious(message)
-});
-
-
-// Page action
-browser.pageAction.onClicked.addListener(function(page) {
-  toInvidious({url: page.url, targetName: "_self"});
 });

manifest.json

@@ -2,22 +2,13 @@
 
   "manifest_version": 2,
   "name": "Youtube to invidious",
-  "version": "0.4",
+  "version": "0.1",
 
   "description": "Change every youtube link to an invidious one",
 
   "icons": {
     "48": "icons/48.png"
   },
-  "page_action": {
-    "show_matches": ["https://*.youtube.com/watch*"],
-    "browser_style": true,
-    "default_icon": {
-      "19": "button/19.png",
-      "38": "button/38.png"
-    }
-  },
-
   "web_accessible_resources": ["icons/48.png"],
   "content_scripts": [
     {
@@ -36,7 +27,7 @@
 
   "browser_specific_settings": {
     "gecko": {
-      "id": "11f63659fb336c2593b0f48375566cf66c5d8e12d@amine-louveau.fr"
+      "id": "1f63659fb336c2593b0f48375566cf66c5d8e12d@amine-louveau.fr"
     }
   }
 

to-invidious.js

@@ -1,62 +1,11 @@
-function findATagsAndAddListener(el) {
+window.addEventListener("click", (e) => {
-  let tags = [];
-
-  // Google has elements that prevent click on links. May need different handling
-  // if (window.location.href.indexOf("google.") >= 0) {
-  //   const elements = document.getElementsByClassName("NqpkQc");
-  //   while(elements.length > 0){
-  //       elements[0].parentNode.removeChild(elements[0]);
-  //   }
-  // }
-
-  if (window.location.href.indexOf('youtube.com') >= 0) {
-    tags = el.querySelectorAll('a[href*="/watch"]');
-  } else {
-    tags = el.querySelectorAll('a[href*="youtube.com/"]');
-  }
-
-  for (i = 0; i < tags.length; i++) {
-    addListenerToATag(tags[i]);
-  }
-}
-
-function addListenerToATag(tag) {
-  tag.addEventListener('click', function(e) {
-    e.preventDefault();
-    e.stopImmediatePropagation();
-
-    // Find the a tag
   var target = e.target;
   while ((target.tagName != "A" || !target.href) && target.parentNode) {
     target = target.parentNode;
   }
+  if (target.tagName != "A" || target.href.indexOf('youtube') == -1) 
+    return;
 
-    let targetName = (target.attributes.target != null ? target.attributes.target.nodeValue : '_self')
+  e.preventDefault();
-    if (e.ctrlKey || e.metaKey) {
+  browser.runtime.sendMessage({"youtubeUrl": target.href, "targetName": (target.attributes.target != null ? target.attributes.target.nodeValue : '_self')});
-      targetName = "_blank";
-    }
-
-    browser.runtime.sendMessage({"url": target.href, "targetName": targetName});
-  })
-}
-
-// Add the event listeners to the current elements of the body
-findATagsAndAddListener(document.body);
-
-// Monitor the DOM for additions and create event listeners on the go
-const observer = new MutationObserver((mutations) => {
-  mutations.forEach((mutation) => {
-    if (mutation.addedNodes && mutation.addedNodes.length > 0) {
-      for (let i = 0; i < mutation.addedNodes.length; i++) {
-        const newNode = mutation.addedNodes[i];
-        if (newNode.nodeType === Node.ELEMENT_NODE || newNode.nodeType === Node.DOCUMENT_NODE || newNode.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
-          findATagsAndAddListener(newNode);
-        }
-      }
-    }
-  });
-});
-observer.observe(document.body, {
-  childList: true,
-  subtree: true
 });