Updating images. Bump version => 2.0.0

3 files changed, 14 insertions, 15 deletions

diff --git a/src/instances/blocklist.json b/src/instances/blocklist.json
index 43117458..528913ed 100644
--- a/src/instances/blocklist.json
+++ b/src/instances/blocklist.json
@@ -6,12 +6,12 @@
   "https://piped.moomoo.me",
   "https://piped.syncpundit.com",
   "https://piped.mha.fi",
+  "https://piped.shimul.me",
   "https://nhanh.cloud",
   "https://nitter.nixnet.services",
   "https://nitter.domain.glass",
   "https://birdsite.xanny.family",
   "https://nitter.moomoo.me",
-  "https://nitter.it",
   "https://notabird.site",
   "https://fuckthesacklers.network",
   "https://nitter.govt.land",
diff --git a/src/instances/data.json b/src/instances/data.json
index c3d74514..5ad30314 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -12,13 +12,13 @@
       "https://yt.artemislena.eu",
       "https://invidious.flokinet.to",
       "https://invidious.sethforprivacy.com",
-      "https://invidious.mutahar.rocks",
       "https://invidious.tiekoetter.com",
       "https://inv.bp.projectsegfau.lt",
       "https://invidious.lunar.icu",
       "https://invidious.weblibre.org",
       "https://invidious.esmailelbob.xyz",
       "https://youtube.076.ne.jp",
+      "https://invidious.mutahar.rocks",
       "https://invidious.namazso.eu"
     ],
     "tor": [
@@ -280,7 +280,8 @@
       "https://wikiless.lunar.icu",
       "https://wiki.froth.zone",
       "https://wikiless.northboot.xyz",
-      "https://wikiless.tiekoetter.com"
+      "https://wikiless.tiekoetter.com",
+      "https://wikiless.esmailelbob.xyz/"
     ],
     "tor": [
       "http://dj2tbh2nqfxyfmvq33cjmhuw7nb6am7thzd3zsjvizeqf374fixbrxyd.onion",
@@ -366,6 +367,7 @@
       "https://search.snopyta.org",
       "https://search.stinpriza.org",
       "https://search.trom.tf",
+      "https://search.vojkovic.xyz",
       "https://searx.bissisoft.com",
       "https://searx.divided-by-zero.eu",
       "https://searx.dresden.network",
@@ -392,6 +394,7 @@
       "https://searx.sp-codes.de",
       "https://searx.stuehieyr.com",
       "https://searx.theanonymouse.xyz",
+      "https://searx.tiekoetter.com",
       "https://searx.tk",
       "https://searx.tux.land",
       "https://searx.tuxcloud.net",
@@ -435,7 +438,6 @@
       "https://search.privacyguides.net",
       "https://search.rabbit-company.com",
       "https://search.roombob.cat",
-      "https://search.vojkovic.xyz",
       "https://search.zzls.xyz",
       "https://searx.albony.xyz",
       "https://searx.bardia.tech",
@@ -451,7 +453,6 @@
       "https://searx.ppeb.me",
       "https://searx.prvcy.eu",
       "https://searx.sev.monster",
-      "https://searx.tiekoetter.com",
       "https://searxng.zackptg5.com",
       "https://swag.pw",
       "https://www.webrats.xyz"
@@ -1021,7 +1022,6 @@
     "https://media.over-world.org",
     "https://tube.avensio.de",
     "https://peertube.klaewyss.fr",
-    "https://video.cpn.so",
     "https://sender-fm.veezee.tube",
     "https://peertube.takeko.cyou",
     "https://tube.chatelet.ovh",
@@ -1077,7 +1077,6 @@
     "https://fair.tube",
     "https://tube.lokad.com",
     "https://videos.benjaminbrady.ie",
-    "https://peertube.bgzashtita.es",
     "https://video.binarydad.com",
     "https://tube.pmj.rocks",
     "https://gary.vger.cloud",
diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py
index b47433ba..b2937d7e 100644
--- a/src/instances/get_instances.py
+++ b/src/instances/get_instances.py
@@ -381,14 +381,14 @@ for k1, v1 in mightyList.items():
     if type(mightyList[k1]) is dict:
         for k2, v2 in mightyList[k1].items():
             for instance in mightyList[k1][k2]:
-                # if (not isValid(instance)):
-                #     del mightyList[k1][k2][instance]
-                #     print("removed " + instance)
-                # else:
-                if not instance.endswith('.onion') and not instance.endswith('.i2p') and is_cloudflare(instance):
-                    blocklist.append(instance)
-                if not instance.endswith('.onion') and not instance.endswith('.i2p') and is_authenticate(instance):
-                    blocklist.append(instance)
+                if (not isValid(instance)):
+                    mightyList[k1][k2].pop(instance)
+                    print("removed " + instance)
+                else:
+                    if not instance.endswith('.onion') and not instance.endswith('.i2p') and is_cloudflare(instance):
+                        blocklist.append(instance)
+                    if not instance.endswith('.onion') and not instance.endswith('.i2p') and is_authenticate(instance):
+                        blocklist.append(instance)
 
 peertube()