From b96b2a6ebad0539f23eecbea2849be6cdee7fa0e Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Wed, 23 Jun 2021 14:12:03 +0200
Subject: [PATCH] Update invidious instances

---
 .../services/youtube/YoutubeParsingHelper.java   | 16 ++++++++++++----
 .../YoutubeStreamLinkHandlerFactory.java         | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
index 45bc74c10..475db06c1 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
@@ -125,18 +125,26 @@ public class YoutubeParsingHelper {
                 || host.equalsIgnoreCase("invidious.snopyta.org")
                 || host.equalsIgnoreCase("yewtu.be")
                 || host.equalsIgnoreCase("tube.connect.cafe")
-                || host.equalsIgnoreCase("invidious.zapashcanon.fr")
                 || host.equalsIgnoreCase("invidious.kavin.rocks")
-                || host.equalsIgnoreCase("invidious.tube")
+                || host.equalsIgnoreCase("invidious-us.kavin.rocks")
+                || host.equalsIgnoreCase("piped.kavin.rocks")
                 || host.equalsIgnoreCase("invidious.site")
-                || host.equalsIgnoreCase("invidious.xyz")
                 || host.equalsIgnoreCase("vid.mint.lgbt")
                 || host.equalsIgnoreCase("invidiou.site")
                 || host.equalsIgnoreCase("invidious.fdn.fr")
                 || host.equalsIgnoreCase("invidious.048596.xyz")
                 || host.equalsIgnoreCase("invidious.zee.li")
                 || host.equalsIgnoreCase("vid.puffyan.us")
-                || host.equalsIgnoreCase("ytprivate.com");
+                || host.equalsIgnoreCase("ytprivate.com")
+                || host.equalsIgnoreCase("invidious.namazso.eu")
+                || host.equalsIgnoreCase("invidious.silkky.cloud")
+                || host.equalsIgnoreCase("invidious.exonip.de")
+                || host.equalsIgnoreCase("inv.riverside.rocks")
+                || host.equalsIgnoreCase("invidious.blamefran.net")
+                || host.equalsIgnoreCase("invidious.moomoo.me")
+                || host.equalsIgnoreCase("ytb.trom.tf")
+                || host.equalsIgnoreCase("yt.cyberhost.uk")
+                || host.equalsIgnoreCase("y.com.cm");
     }
 
     /**
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeStreamLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeStreamLinkHandlerFactory.java
index bff9d8277..f8b40a092 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeStreamLinkHandlerFactory.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeStreamLinkHandlerFactory.java
@@ -177,18 +177,26 @@ public class YoutubeStreamLinkHandlerFactory extends LinkHandlerFactory {
             case "INVIDIOUS.SNOPYTA.ORG":
             case "YEWTU.BE":
             case "TUBE.CONNECT.CAFE":
-            case "INVIDIOUS.ZAPASHCANON.FR":
             case "INVIDIOUS.KAVIN.ROCKS":
-            case "INVIDIOUS.TUBE":
+            case "INVIDIOUS-US.KAVIN.ROCKS":
+            case "PIPED.KAVIN.ROCKS":
             case "INVIDIOUS.SITE":
-            case "INVIDIOUS.XYZ":
             case "VID.MINT.LGBT":
             case "INVIDIOU.SITE":
             case "INVIDIOUS.FDN.FR":
             case "INVIDIOUS.048596.XYZ":
             case "INVIDIOUS.ZEE.LI":
             case "VID.PUFFYAN.US":
-            case "YTPRIVATE.COM": { // code-block for hooktube.com and Invidious instances
+            case "YTPRIVATE.COM":
+            case "INVIDIOUS.NAMAZSO.EU":
+            case "INVIDIOUS.SILKKY.CLOUD":
+            case "INVIDIOUS.EXONIP.DE":
+            case "INV.RIVERSIDE.ROCKS":
+            case "INVIDIOUS.BLAMEFRAN.NET":
+            case "INVIDIOUS.MOOMOO.ME":
+            case "YTB.TROM.TF":
+            case "YT.CYBERHOST.UK":
+            case "Y.COM.CM": { // code-block for hooktube.com and Invidious instances
                 if (path.equals("watch")) {
                     String viewQueryValue = Utils.getQueryValue(url, "v");
                     if (viewQueryValue != null) {