1 files changed, 22 insertions, 10 deletions

diff --git a/background.js b/background.js
index 94cb616..ad9d3c4 100644
--- a/background.js
+++ b/background.js
@@ -13,13 +13,11 @@ const youtubeDomains = [
 ];
 const invidiousInstances = [
   "https://invidious.snopyta.org",
-  "https://yewtu.be",
-  "https://invidious.13ad.de",
-  "https://invidious.xyz",
   "https://invidious.site",
+  "https://invidious.zapashcanon.fr",
   "https://invidiou.site",
-  "https://invidious.fdn.fr",
-  "https://invidious.toot.koeln",
+  "https://invidious.kavin.rocks",
+  "https://tube.connect.cafe",
 ];
 const twitterDomains = [
   "twitter.com",
@@ -41,6 +39,8 @@ const nitterInstances = [
   "https://nitter.fdn.fr",
   "https://nitter.1d4.us",
   "https://nitter.kavin.rocks",
+  "https://nitter.dark.fail",
+  "https://tweet.lambda.dance",
 ];
 const instagramDomains = [
   "instagram.com",
@@ -70,6 +70,8 @@ const instagramReservedPaths = [
   "imageproxy",
   "videoproxy",
   ".well-known",
+  "tv",
+  "reel",
 ];
 const bibliogramBypassPaths = /\/(accounts\/|embeds?.js)/;
 const bibliogramInstances = [
@@ -78,9 +80,10 @@ const bibliogramInstances = [
   "https://bibliogram.pussthecat.org",
   "https://bibliogram.nixnet.services",
   "https://bg.endl.site",
-  "https://bibliogram.13ad.de	",
-  "https://bibliogram.stemy.me	",
+  "https://bibliogram.13ad.de",
+  "https://bibliogram.pixelfed.uno",
   "https://bibliogram.hamster.dance",
+  "https://bibliogram.kavin.rocks",
   "https://bibliogram.ggc-project.de",
 ];
 const osmDefault = "https://openstreetmap.org";
@@ -131,6 +134,7 @@ let invidiousVolume;
 let invidiousPlayerStyle;
 let invidiousSubtitles;
 let invidiousAutoplay;
+let useFreeTube;
 let exceptions;
 
 window.browser = window.browser || window.chrome;
@@ -155,6 +159,7 @@ browser.storage.sync.get(
     "invidiousPlayerStyle",
     "invidiousSubtitles",
     "invidiousAutoplay",
+    "useFreeTube",
     "exceptions",
   ],
   (result) => {
@@ -181,6 +186,7 @@ browser.storage.sync.get(
     invidiousPlayerStyle = result.invidiousPlayerStyle;
     invidiousSubtitles = result.invidiousSubtitles || "";
     invidiousAutoplay = result.invidiousAutoplay;
+    useFreeTube = result.useFreeTube;
   }
 );
 
@@ -239,6 +245,9 @@ browser.storage.onChanged.addListener((changes) => {
   if ("invidiousAutoplay" in changes) {
     invidiousAutoplay = changes.invidiousAutoplay.newValue;
   }
+  if ("useFreeTube" in changes) {
+    useFreeTube = changes.useFreeTube.newValue;
+  }
   if ("exceptions" in changes) {
     exceptions = changes.exceptions.newValue.map((e) => {
       return new RegExp(e);
@@ -309,6 +318,9 @@ function redirectYouTube(url, initiator, type) {
   if (onlyEmbeddedVideo && type !== "sub_frame") {
     return null;
   }
+  if (useFreeTube && type !== "sub_frame") {
+    return `freetube://${url}`;
+  }
   // Apply settings
   if (alwaysProxy) {
     url.searchParams.append("local", true);
@@ -330,9 +342,9 @@ function redirectYouTube(url, initiator, type) {
   }
   url.searchParams.append("autoplay", invidiousAutoplay ? 1 : 0);
 
-  return `${invidiousInstance || getRandomInstance(invidiousInstances)}${
-    url.pathname
-  }${url.search}`;
+  return `${
+    invidiousInstance || getRandomInstance(invidiousInstances)
+  }${url.pathname.replace("/shorts", "")}${url.search}`;
 }
 
 function redirectTwitter(url, initiator) {