about summary refs log tree commit diff stats
path: root/src/instances
diff options
context:
space:
mode:
Diffstat (limited to 'src/instances')
-rw-r--r--src/instances/blacklist.json4
-rw-r--r--src/instances/data.json57
2 files changed, 55 insertions, 6 deletions
diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 221058ee..77aec738 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -4,8 +4,8 @@
     "https://piped.kavin.rocks",
     "https://piped.tokhmi.xyz",
     "https://piped.moomoo.me",
-    "https://piped.syncpundit.com",
     "https://piped.mha.fi",
+    "https://de-piped.shimul.me",
     "https://jp-piped.shimul.me",
     "https://pipedus.palash.dev",
     "https://piped.waffle.wiki",
@@ -81,4 +81,4 @@
     "https://beatbump.ml",
     "https://stube.tokhmi.xyz"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/instances/data.json b/src/instances/data.json
index c5334a47..76c9f6d3 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -3,6 +3,13 @@
     "normal": [
       "https://yewtu.be",
       "https://vid.puffyan.us",
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+      "https://invidious.snopyta.org",
+>>>>>>> 0b6c717 (update instances)
+=======
+>>>>>>> origin/master
       "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
       "https://invidious.osi.kr",
@@ -16,12 +23,25 @@
       "https://invidious.nerdvpn.de",
       "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
+<<<<<<< HEAD
+<<<<<<< HEAD
+      "https://youtube.076.ne.jp",
+      "https://invidious.weblibre.org",
+      "https://invidious.snopyta.org",
+=======
       "https://youtube.076.ne.jp",
       "https://invidious.weblibre.org",
       "https://invidious.snopyta.org",
       "https://invidious.projectsegfau.lt",
+>>>>>>> origin/master
       "https://invidious.esmailelbob.xyz",
       "https://invidious.namazso.eu"
+=======
+      "https://invidious.weblibre.org",
+      "https://youtube.076.ne.jp",
+      "https://invidious.namazso.eu",
+      "https://invidious.esmailelbob.xyz"
+>>>>>>> 0b6c717 (update instances)
     ],
     "tor": [
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
@@ -43,13 +63,24 @@
       "https://piped.tokhmi.xyz",
       "https://piped.moomoo.me",
       "https://il.ax",
-      "https://piped.syncpundit.com",
       "https://piped.mha.fi",
+<<<<<<< HEAD
+      "https://de-piped.shimul.me",
+=======
       "https://jp-piped.shimul.me",
+>>>>>>> origin/master
       "https://pipedus.palash.dev",
       "https://piped.waffle.wiki",
       "https://watch.whatever.social",
       "https://yt.jae.fi",
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+      "https://piped.mint.lgbt",
+      "https://piped.privacy.com.de",
+>>>>>>> 0b6c717 (update instances)
+=======
+>>>>>>> origin/master
       "https://piped.esmailelbob.xyz",
       "https://piped.projectsegfau.lt"
     ],
@@ -484,6 +515,7 @@
       "https://searx.bissisoft.com",
       "https://searx.divided-by-zero.eu",
       "https://searx.dresden.network",
+      "https://searx.ebnar.xyz",
       "https://searx.fossencdi.org",
       "https://searx.gnu.style",
       "https://searx.mastodontech.de",
@@ -519,8 +551,17 @@
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
+<<<<<<< HEAD
+<<<<<<< HEAD
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
+=======
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
+      "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx"
+>>>>>>> 0b6c717 (update instances)
+=======
       "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
+>>>>>>> origin/master
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -565,7 +606,6 @@
       "https://searx.be",
       "https://searx.becomesovran.com",
       "https://searx.chocoflan.net",
-      "https://searx.ebnar.xyz",
       "https://searx.ericaftereric.top",
       "https://searx.esmailelbob.xyz",
       "https://searx.fi",
@@ -582,6 +622,10 @@
       "https://searx.sev.monster",
       "https://searx.slipfox.xyz/searx",
       "https://searx.tiekoetter.com",
+<<<<<<< HEAD
+      "https://searx.vimproved.me",
+=======
+>>>>>>> origin/master
       "https://searx.zcyph.cc",
       "https://searxng.au/searx",
       "https://searxng.tordenskjold.de",
@@ -605,7 +649,6 @@
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
-      "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
       "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
       "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion"
     ],
@@ -733,7 +776,14 @@
     "loki": []
   },
   "peertube": [
+<<<<<<< HEAD
+<<<<<<< HEAD
+    "https://tube.nogafa.org",
+=======
+>>>>>>> 0b6c717 (update instances)
+=======
     "https://tube.nogafa.org",
+>>>>>>> origin/master
     "https://www.neptube.io",
     "https://tube.ghk-academy.info",
     "https://pcbu.nl",
@@ -820,7 +870,6 @@
     "https://tube-enseignement-professionnel.apps.education.fr",
     "https://socpeertube.ru",
     "https://videos.laliguepaysdelaloire.org",
-    "https://videotube.duckdns.org",
     "https://quantube.win",
     "https://twctube.twc-zone.eu",
     "https://vhs.absturztau.be",