From 9efbaccc14b5af7a74bd6eeac009720d7bfba06b Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Wed, 13 Jul 2022 22:32:45 +0000
Subject: update instances

---
 src/instances/data.json | 65 +++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 35 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/data.json b/src/instances/data.json
index 1c942300..0b8e1215 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -4,9 +4,7 @@
       "https://yewtu.be",
       "https://vid.puffyan.us",
       "https://invidious.snopyta.org",
-      "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
-      "https://invidious.osi.kr",
       "https://y.com.sb",
       "https://yt.artemislena.eu",
       "https://invidious.flokinet.to",
@@ -18,14 +16,17 @@
       "https://invidious.nerdvpn.de",
       "https://invidious.slipfox.xyz",
       "https://youtube.076.ne.jp",
-      "https://invidious.esmailelbob.xyz",
       "https://invidious.weblibre.org",
-      "https://invidious.namazso.eu"
+      "https://invidious.esmailelbob.xyz",
+      "https://invidious.namazso.eu",
+      "https://invidious.kavin.rocks",
+      "https://invidious.osi.kr"
     ],
     "tor": [
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
       "http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion",
       "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion",
+      "http://grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad.onion",
       "http://osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion",
       "http://u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad.onion",
       "http://euxxcnhsynwmfidvhjf6uzptsmh4dipkmgdmcmxxuo7tunp3ad2jrwyd.onion/",
@@ -46,7 +47,8 @@
       "https://yt.jae.fi",
       "https://piped.mint.lgbt",
       "https://piped.privacy.com.de",
-      "https://piped.esmailelbob.xyz"
+      "https://piped.esmailelbob.xyz",
+      "https://piped.projectsegfau.lt/"
     ],
     "tor": [
       "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion"
@@ -128,6 +130,7 @@
       "https://nitter.bird.froth.zone",
       "https://nitter.dcs0.hu",
       "https://twitter.dr460nf1r3.org",
+      "https://nitter.garudalinux.org",
       "https://twitter.beparanoid.de",
       "https://n.ramle.be",
       "https://nitter.cz",
@@ -143,7 +146,8 @@
       "https://nitter.wef.lol",
       "https://nitter.tokhmi.xyz",
       "https://nitter.catalyst.sx",
-      "https://unofficialbird.com"
+      "https://unofficialbird.com",
+      "https://nitter.projectsegfau.lt"
     ],
     "tor": [
       "http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion",
@@ -181,9 +185,10 @@
       "https://bibliogram.froth.zone",
       "https://insta.trom.tf",
       "https://insta.tromdienste.de",
-      "https://biblio.alefvanoon.xyz",
+      "https://ig.tokhmi.xyz",
       "https://ig.beparanoid.de",
       "https://bibliogram.privacydev.net",
+      "https://bibliogram.priv.pw",
       "https://bib.actionsack.com"
     ],
     "tor": []
@@ -344,7 +349,8 @@
       "https://quetre.pussthecat.org",
       "https://wuetre.herokuapp.com",
       "https://quetreus.herokuapp.com",
-      "https://quetre.tokhmi.xyz"
+      "https://quetre.tokhmi.xyz",
+      "https://quetre.projectsegfau.lt"
     ],
     "tor": []
   },
@@ -402,13 +408,11 @@
   "searx": {
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
-      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
       "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
-      "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
-      "http://searx.bsbvtqi5oq2cqzn32zt4cr2f2z2rwots3dq7gmdcnlyqoxko2wx6reqd.onion"
+      "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -418,9 +422,7 @@
       "https://anon.sx",
       "https://dynabyte.ca",
       "https://jsearch.pw",
-      "https://nibblehole.com",
       "https://search.ethibox.fr",
-      "https://search.jpope.org",
       "https://search.snopyta.org",
       "https://search.stinpriza.org",
       "https://search.trom.tf",
@@ -429,7 +431,6 @@
       "https://searx.dresden.network",
       "https://searx.fossencdi.org",
       "https://searx.gnu.style",
-      "https://searx.josie.lol",
       "https://searx.mastodontech.de",
       "https://searx.mxchange.org",
       "https://searx.nakhan.net",
@@ -437,7 +438,6 @@
       "https://searx.nixnet.services",
       "https://searx.openhoofd.nl",
       "https://searx.org",
-      "https://searx.ppeb.me",
       "https://searx.pwoss.org",
       "https://searx.rasp.fr",
       "https://searx.ru",
@@ -457,12 +457,12 @@
       "https://suche.uferwerk.org",
       "https://sx.catgirl.cloud",
       "https://timdor.noip.me/searx",
-      "https://www.gruble.de",
       "https://searx.roflcopter.fr"
     ]
   },
   "searxng": {
     "tor": [
+      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
       "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
@@ -478,16 +478,21 @@
       "https://darmarit.org/searx",
       "https://de.xcxc.ml",
       "https://etsi.me",
+      "https://icanfindit.online",
       "https://northboot.xyz",
       "https://notgoogle.win",
       "https://opnxng.com",
       "https://paulgo.io",
+      "https://private-searx.ml",
+      "https://privatus.live",
       "https://s.frlt.one",
       "https://s.zhaocloud.net",
       "https://search.ashs.club",
       "https://search.bingowaves.xyz",
       "https://search.bus-hit.me",
+      "https://search.chemicals-in-the-water.eu",
       "https://search.disroot.org",
+      "https://search.gcomm.ch",
       "https://search.kiwitalk.de",
       "https://search.mdosch.de",
       "https://search.neet.works",
@@ -499,7 +504,6 @@
       "https://search.unlocked.link",
       "https://search.vojkovic.xyz",
       "https://search.zzls.xyz",
-      "https://searx.albony.xyz",
       "https://searx.be",
       "https://searx.becomesovran.com",
       "https://searx.chocoflan.net",
@@ -532,6 +536,7 @@
       "https://serx.ml",
       "https://srx.cosmohub.io",
       "https://swag.pw",
+      "https://www.gruble.de",
       "https://www.webrats.xyz",
       "https://xcxc.ml"
     ]
@@ -565,21 +570,24 @@
       "https://i.actionsack.com",
       "https://rimgo.privacydev.net",
       "https://imgur.artemislena.eu",
-      "https://rimgo.vern.cc"
+      "https://rimgo.vern.cc",
+      "https://rimgo.encrypted-data.xyz",
+      "https://rimgo.mha.fi"
     ],
     "tor": [
       "http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
-      "http://rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
+      "http://rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
+      "http://rimgo.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
     ],
     "i2p": []
   },
   "peertube": [
+    "https://peertube.ctrl-c.liu.se",
+    "https://peertube.live",
     "https://video.slipfox.xyz",
     "https://pt.vern.cc",
-    "https://3.600900.su",
     "https://vnop.org",
     "https://videos.cassidypunchmachine.com",
-    "https://video.mullet.social",
     "https://tv1.gomntu.space",
     "https://dalek.zone",
     "https://seka.pona.la",
@@ -638,10 +646,8 @@
     "https://tube.nestor.coop",
     "https://live.oldskool.fi",
     "https://dytube.com",
-    "https://video.toby3d.me",
     "https://tube.thierrytalbert.fr",
     "https://peertube.informaction.info",
-    "https://peertube.thele.me",
     "https://tube.ac-amiens.fr",
     "https://tube.alado.space",
     "https://tube.network.europa.eu",
@@ -653,7 +659,6 @@
     "https://cliptube.org",
     "https://tube.tr4sk.me",
     "https://videos.campdarling.com",
-    "https://peertube.live",
     "https://video.mikka.md",
     "https://www.aktion-nordost.tv",
     "https://tube.rooty.fr",
@@ -752,7 +757,6 @@
     "https://peertube.hacknews.pmdcollab.org",
     "https://freetubes.nohost.me",
     "https://video.simplex-software.ru",
-    "https://wwtube.net",
     "https://video.snug.moe",
     "https://video.avant-le-strike.buzz",
     "https://videos.ritimo.org",
@@ -760,7 +764,6 @@
     "https://video.cerclearistote.com",
     "https://computerstuff.mooo.com",
     "https://video.greenmycity.eu",
-    "https://peertubemirror.satoshishop.de",
     "https://przej.me",
     "https://pt.mezzo.moe",
     "https://tube.dsocialize.net",
@@ -859,7 +862,6 @@
     "https://tube.1o1.io",
     "https://peertube.aventer.biz",
     "https://videos.rights.ninja",
-    "https://pertur.be",
     "https://tube.pilgerweg-21.de",
     "https://freediverse.com",
     "https://pocketnetpeertube2.nohost.me",
@@ -900,7 +902,6 @@
     "https://dud-video.inf.tu-dresden.de",
     "https://media-test.interior.edu.uy",
     "https://media.interior.edu.uy",
-    "https://bitcast.online",
     "https://peertube.la-scic.fr",
     "https://phoenixproject.group",
     "https://peertube.sebu77.com",
@@ -1118,7 +1119,6 @@
     "https://video.shitposter.club",
     "https://tv.mattchristiansenmedia.com",
     "https://tube.hackerscop.org",
-    "https://videos.capas.se",
     "https://peertube.kx.studio",
     "https://videos.3d-wolf.com",
     "https://tube.octaplex.net",
@@ -1218,7 +1218,6 @@
     "https://evangelisch.video",
     "https://tube.anufrij.de",
     "https://videos.mastodont.cat",
-    "https://flim.txmn.tk",
     "https://video.taboulisme.com",
     "https://media.undeadnetwork.de",
     "https://tube.dragonpsi.xyz",
@@ -1354,7 +1353,6 @@
     "https://tube.others.social",
     "https://videos.ubuntu-paris.org",
     "https://tube-poitiers.beta.education.fr",
-    "https://streamsource.video",
     "https://vid.wildeboer.net",
     "https://battlepenguin.video",
     "https://peertube.cloud.sans.pub",
@@ -1380,7 +1378,6 @@
     "https://peertube.devloprog.org",
     "https://peertube.designersethiques.org",
     "https://testtube.florimond.eu",
-    "https://tube.gnous.eu",
     "https://tube-lille.beta.education.fr",
     "https://peertube.monlycee.net",
     "https://tube.plomlompom.com",
@@ -1510,7 +1507,6 @@
     "https://video.lemediatv.fr",
     "https://peertube.artica.center",
     "https://indymotion.fr",
-    "https://video.farci.org",
     "https://tube.fede.re",
     "https://peertube.mygaia.org",
     "https://peertube.livingutopia.org",
@@ -1550,7 +1546,6 @@
     "https://www.yiny.org",
     "https://video.typica.us",
     "https://videos.lescommuns.org",
-    "https://dialup.express",
     "https://peertube.1312.media",
     "https://skeptikon.fr",
     "https://video.blueline.mg",
@@ -1578,4 +1573,4 @@
     "https://peertube2.cpy.re",
     "https://peertube.cpy.re"
   ]
-}
+}
\ No newline at end of file
-- 
cgit 1.4.1


From bd761e7bdd4dae9538e691410d94a38ba70f8d55 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sat, 16 Jul 2022 22:32:42 +0000
Subject: update instances

---
 src/instances/blacklist.json |  2 +-
 src/instances/data.json      | 26 +++++++++++---------------
 2 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index c7534253..710ebc14 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -18,13 +18,13 @@
     "https://twitter.dr460nf1r3.org",
     "https://nitter.garudalinux.org",
     "https://nitter.wef.lol",
-    "https://nitter.catalyst.sx",
     "https://bib.actionsack.com",
     "https://libreddit.domain.glass",
     "https://r.nf",
     "https://libreddit.flux.industries",
     "https://lr.oversold.host",
     "https://libreddit.hu",
+    "https://lr.stilic.ml",
     "https://reddi.tk",
     "https://r.walkx.org",
     "https://libreddit.yonalee.eu",
diff --git a/src/instances/data.json b/src/instances/data.json
index 0b8e1215..bf2f0196 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -5,6 +5,7 @@
       "https://vid.puffyan.us",
       "https://invidious.snopyta.org",
       "https://inv.riverside.rocks",
+      "https://invidious.osi.kr",
       "https://y.com.sb",
       "https://yt.artemislena.eu",
       "https://invidious.flokinet.to",
@@ -19,8 +20,7 @@
       "https://invidious.weblibre.org",
       "https://invidious.esmailelbob.xyz",
       "https://invidious.namazso.eu",
-      "https://invidious.kavin.rocks",
-      "https://invidious.osi.kr"
+      "https://invidious.kavin.rocks"
     ],
     "tor": [
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
@@ -147,7 +147,9 @@
       "https://nitter.tokhmi.xyz",
       "https://nitter.catalyst.sx",
       "https://unofficialbird.com",
-      "https://nitter.projectsegfau.lt"
+      "https://nitter.projectsegfau.lt",
+      "https://singapore.unofficialbird.com",
+      "https://twt.funami.tech"
     ],
     "tor": [
       "http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion",
@@ -411,8 +413,7 @@
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
-      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
-      "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion"
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -422,6 +423,7 @@
       "https://anon.sx",
       "https://dynabyte.ca",
       "https://jsearch.pw",
+      "https://notgoogle.win",
       "https://search.ethibox.fr",
       "https://search.snopyta.org",
       "https://search.stinpriza.org",
@@ -436,7 +438,6 @@
       "https://searx.nakhan.net",
       "https://searx.netzspielplatz.de",
       "https://searx.nixnet.services",
-      "https://searx.openhoofd.nl",
       "https://searx.org",
       "https://searx.pwoss.org",
       "https://searx.rasp.fr",
@@ -451,6 +452,7 @@
       "https://searx.webheberg.info",
       "https://searx.xyz",
       "https://searx.zapashcanon.fr",
+      "https://searxng.ir",
       "https://spot.ecloud.global",
       "https://suche.dasnetzundich.de",
       "https://suche.tromdienste.de",
@@ -470,6 +472,7 @@
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
+      "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
       "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
       "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion"
     ],
@@ -480,7 +483,6 @@
       "https://etsi.me",
       "https://icanfindit.online",
       "https://northboot.xyz",
-      "https://notgoogle.win",
       "https://opnxng.com",
       "https://paulgo.io",
       "https://private-searx.ml",
@@ -498,6 +500,7 @@
       "https://search.neet.works",
       "https://search.ononoki.org",
       "https://search.privacyguides.net",
+      "https://search.projectsegfau.lt",
       "https://search.rabbit-company.com",
       "https://search.sapti.me",
       "https://search.teamriverbubbles.com",
@@ -530,7 +533,6 @@
       "https://searx.youshitsune.me",
       "https://searx.zcyph.cc",
       "https://searxng.au/searx",
-      "https://searxng.ir",
       "https://searxng.tordenskjold.de",
       "https://searxng.zackptg5.com",
       "https://serx.ml",
@@ -582,6 +584,7 @@
     "i2p": []
   },
   "peertube": [
+    "https://video.fox-romka.ru",
     "https://peertube.ctrl-c.liu.se",
     "https://peertube.live",
     "https://video.slipfox.xyz",
@@ -696,7 +699,6 @@
     "https://videos.redeyes.site",
     "https://video.hostpath.de",
     "https://free-streams.com",
-    "https://video.chadwaltercummings.me",
     "https://tube.pawelko.net",
     "https://video.livecchi.cloud",
     "https://anarchy.video",
@@ -783,7 +785,6 @@
     "https://creemoseducacioninclusiva.uma.es",
     "https://videos.yeswiki.net",
     "https://tube.lrk.sh",
-    "https://peertube.teneriffe.nohost.me",
     "https://peertube.autogestioncitoyenne.org",
     "https://stream.dynacloud.ynh.fr",
     "https://video.r3s.nrw",
@@ -796,7 +797,6 @@
     "https://vid.lelux.fi",
     "https://v.wolfskaempf.de",
     "https://peertube.chevro.fr",
-    "https://peertube.minecloud.ro",
     "https://media.econoalchemist.com",
     "https://video.qoto.org",
     "https://peertube.maxweiss.io",
@@ -1022,7 +1022,6 @@
     "https://video.ustim.ru",
     "https://merci-la-police.fr",
     "https://pocketnetpeertube7.nohost.me",
-    "https://tube.noise.rocks",
     "https://video.rhizome.org",
     "https://dnk.video",
     "https://video.medienzentrum-harburg.de",
@@ -1294,7 +1293,6 @@
     "https://www4.mir.inter21.net",
     "https://video.csc49.fr",
     "https://tube.wolfe.casa",
-    "https://tube.linkse.media",
     "https://video.dresden.network",
     "https://peertube.zapashcanon.fr",
     "https://40two.tube",
@@ -1333,7 +1331,6 @@
     "https://xxx.noho.st",
     "https://peertube.stefofficiel.me",
     "https://canard.tube",
-    "https://videos.jordanwarne.xyz",
     "https://tube.jeena.net",
     "https://tube.cloud-libre.eu",
     "https://videos.coletivos.org",
@@ -1513,7 +1510,6 @@
     "https://tube.anjara.eu",
     "https://video.latavernedejohnjohn.fr",
     "https://peertube.pcservice46.fr",
-    "https://alttube.fr",
     "https://video.coop.tools",
     "https://video.cabane-libre.org",
     "https://peertube.openstreetmap.fr",
-- 
cgit 1.4.1


From a02cd3cceedd7eed62062aa0932cbf57ac2adb25 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Tue, 19 Jul 2022 22:33:10 +0000
Subject: update instances

---
 src/instances/blacklist.json |  6 ++++--
 src/instances/data.json      | 34 +++++++++++++++-------------------
 2 files changed, 19 insertions(+), 21 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 710ebc14..726e4fe3 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -7,7 +7,9 @@
     "https://piped.syncpundit.com",
     "https://piped.mha.fi",
     "https://piped.shimul.me",
-    "https://pipedus.palash.dev/",
+    "https://pipedus.palash.dev",
+    "https://piped.waffle.wiki",
+    "https://watch.whatever.social",
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
     "https://nitter.moomoo.me",
@@ -18,6 +20,7 @@
     "https://twitter.dr460nf1r3.org",
     "https://nitter.garudalinux.org",
     "https://nitter.wef.lol",
+    "https://nitter.fprivacy.com",
     "https://bib.actionsack.com",
     "https://libreddit.domain.glass",
     "https://r.nf",
@@ -39,7 +42,6 @@
     "https://wiki.604kph.xyz",
     "https://searx.org",
     "https://searx.run",
-    "https://searx.kujonello.cf",
     "https://search.albony.xyz",
     "https://search.garudalinux.org",
     "https://search.dr460nf1r3.org",
diff --git a/src/instances/data.json b/src/instances/data.json
index bf2f0196..27745298 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -4,6 +4,7 @@
       "https://yewtu.be",
       "https://vid.puffyan.us",
       "https://invidious.snopyta.org",
+      "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
       "https://invidious.osi.kr",
       "https://y.com.sb",
@@ -17,10 +18,9 @@
       "https://invidious.nerdvpn.de",
       "https://invidious.slipfox.xyz",
       "https://youtube.076.ne.jp",
-      "https://invidious.weblibre.org",
       "https://invidious.esmailelbob.xyz",
-      "https://invidious.namazso.eu",
-      "https://invidious.kavin.rocks"
+      "https://invidious.weblibre.org",
+      "https://invidious.namazso.eu"
     ],
     "tor": [
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
@@ -43,7 +43,9 @@
       "https://piped.syncpundit.com",
       "https://piped.mha.fi",
       "https://piped.shimul.me",
-      "https://pipedus.palash.dev/",
+      "https://pipedus.palash.dev",
+      "https://piped.waffle.wiki",
+      "https://watch.whatever.social",
       "https://yt.jae.fi",
       "https://piped.mint.lgbt",
       "https://piped.privacy.com.de",
@@ -141,7 +143,6 @@
       "https://nitter.oishi-ra.men",
       "https://nitter.foss.wtf",
       "https://nitter.priv.pw",
-      "https://t.com.sb",
       "https://nt.vern.cc",
       "https://nitter.wef.lol",
       "https://nitter.tokhmi.xyz",
@@ -149,7 +150,8 @@
       "https://unofficialbird.com",
       "https://nitter.projectsegfau.lt",
       "https://singapore.unofficialbird.com",
-      "https://twt.funami.tech"
+      "https://twt.funami.tech",
+      "https://nitter.fprivacy.com"
     ],
     "tor": [
       "http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion",
@@ -191,6 +193,7 @@
       "https://ig.beparanoid.de",
       "https://bibliogram.privacydev.net",
       "https://bibliogram.priv.pw",
+      "https://ig.funami.tech",
       "https://bib.actionsack.com"
     ],
     "tor": []
@@ -423,7 +426,6 @@
       "https://anon.sx",
       "https://dynabyte.ca",
       "https://jsearch.pw",
-      "https://notgoogle.win",
       "https://search.ethibox.fr",
       "https://search.snopyta.org",
       "https://search.stinpriza.org",
@@ -449,10 +451,10 @@
       "https://searx.tuxcloud.net",
       "https://searx.tyil.nl",
       "https://searx.vanwa.tech",
+      "https://searx.vimproved.me",
       "https://searx.webheberg.info",
       "https://searx.xyz",
       "https://searx.zapashcanon.fr",
-      "https://searxng.ir",
       "https://spot.ecloud.global",
       "https://suche.dasnetzundich.de",
       "https://suche.tromdienste.de",
@@ -466,6 +468,7 @@
     "tor": [
       "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
+      "http://x5gdjh6t7kb4yubpufhtc3l3df2acev3emxdasd5vyuyoon5rzf5zkyd.onion",
       "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
@@ -482,9 +485,11 @@
       "https://de.xcxc.ml",
       "https://etsi.me",
       "https://icanfindit.online",
+      "https://jackgoss.xyz",
       "https://northboot.xyz",
       "https://opnxng.com",
       "https://paulgo.io",
+      "https://priv.au",
       "https://private-searx.ml",
       "https://privatus.live",
       "https://s.frlt.one",
@@ -505,7 +510,6 @@
       "https://search.sapti.me",
       "https://search.teamriverbubbles.com",
       "https://search.unlocked.link",
-      "https://search.vojkovic.xyz",
       "https://search.zzls.xyz",
       "https://searx.be",
       "https://searx.becomesovran.com",
@@ -516,7 +520,6 @@
       "https://searx.fi",
       "https://searx.fmac.xyz",
       "https://searx.gnous.eu",
-      "https://searx.kujonello.cf",
       "https://searx.loafland.xyz",
       "https://searx.mha.fi",
       "https://searx.mistli.net",
@@ -529,10 +532,10 @@
       "https://searx.slipfox.xyz/searx",
       "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
       "https://searx.tiekoetter.com",
-      "https://searx.vimproved.me",
       "https://searx.youshitsune.me",
       "https://searx.zcyph.cc",
       "https://searxng.au/searx",
+      "https://searxng.ir",
       "https://searxng.tordenskjold.de",
       "https://searxng.zackptg5.com",
       "https://serx.ml",
@@ -584,6 +587,7 @@
     "i2p": []
   },
   "peertube": [
+    "https://hitchtube.fr",
     "https://video.fox-romka.ru",
     "https://peertube.ctrl-c.liu.se",
     "https://peertube.live",
@@ -599,7 +603,6 @@
     "https://tube.miegl.cz",
     "https://mov.clov.fr",
     "https://videomensoif.ynh.fr",
-    "https://peertube.hainry.fr",
     "https://videos.neongarden.life",
     "https://video.vaku.org.ua",
     "https://videos.trom.lt",
@@ -691,10 +694,8 @@
     "https://videopen.net",
     "https://demo.lioncast.org",
     "https://peertube.get-racing.de",
-    "https://tube-rennes.beta.education.fr",
     "https://pierre.tube",
     "https://mirametube.fr",
-    "https://tube.sanyi.nl",
     "https://vidz.dou.bet",
     "https://videos.redeyes.site",
     "https://video.hostpath.de",
@@ -723,7 +724,6 @@
     "https://tube.linc.systems",
     "https://peertube.ketchup.noho.st",
     "https://yt.x1337x.fr",
-    "https://video.wsforum.net",
     "https://videos.rabbit-company.com",
     "https://video.paradigmthreat.net",
     "https://video.lincolncyber.com",
@@ -781,7 +781,6 @@
     "https://docker.videos.lecygnenoir.info",
     "https://tv.based.quest",
     "https://peertube.beardedtek.com",
-    "https://casnocensure.site",
     "https://creemoseducacioninclusiva.uma.es",
     "https://videos.yeswiki.net",
     "https://tube.lrk.sh",
@@ -821,7 +820,6 @@
     "https://swebbtube.se",
     "https://video.dnfi.no",
     "https://peertube.revelin.fr",
-    "https://video.wsf2021.info",
     "https://armstube.com",
     "https://peertube.ti-fr.com",
     "https://video.turbo.chat",
@@ -949,7 +947,6 @@
     "https://tube.communia.org",
     "https://peertube.dragonborn.app",
     "https://ai-tube.ch",
-    "https://buddhist.tv",
     "https://video.citizen4.eu",
     "https://video.matomocamp.org",
     "https://media.fsfe.org",
@@ -1301,7 +1298,6 @@
     "https://kino.schuerz.at",
     "https://peertube.tiennot.net",
     "https://tututu.tube",
-    "https://peertube.interhop.org",
     "https://tube.picasoft.net",
     "https://www.wiki-tube.de",
     "https://videos.pair2jeux.tube",
-- 
cgit 1.4.1


From a35bee150f2d4f1416efe29585afe95999c8daab Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sun, 24 Jul 2022 08:48:19 +0000
Subject: update instances

---
 src/instances/blacklist.json |  6 ----
 src/instances/data.json      | 69 +++++++-------------------------------------
 2 files changed, 10 insertions(+), 65 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 4377c018..df438be1 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -8,11 +8,8 @@
     "https://piped.mha.fi",
     "https://piped.shimul.me",
     "https://pipedus.palash.dev",
-<<<<<<< HEAD
-=======
     "https://piped.waffle.wiki",
     "https://watch.whatever.social",
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
     "https://nitter.moomoo.me",
@@ -23,10 +20,7 @@
     "https://twitter.dr460nf1r3.org",
     "https://nitter.garudalinux.org",
     "https://nitter.wef.lol",
-<<<<<<< HEAD
     "https://nitter.catalyst.sx",
-=======
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
     "https://nitter.fprivacy.com",
     "https://bib.actionsack.com",
     "https://libreddit.domain.glass",
diff --git a/src/instances/data.json b/src/instances/data.json
index c754bade..0567849f 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -8,7 +8,6 @@
       "https://inv.riverside.rocks",
       "https://invidious.osi.kr",
       "https://y.com.sb",
-      "https://yt.artemislena.eu",
       "https://invidious.flokinet.to",
       "https://invidious.sethforprivacy.com",
       "https://invidious.tiekoetter.com",
@@ -20,7 +19,8 @@
       "https://youtube.076.ne.jp",
       "https://invidious.esmailelbob.xyz",
       "https://invidious.weblibre.org",
-      "https://invidious.namazso.eu"
+      "https://invidious.namazso.eu",
+      "https://yt.artemislena.eu"
     ],
     "tor": [
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
@@ -46,16 +46,13 @@
       "https://piped.mha.fi",
       "https://piped.shimul.me",
       "https://pipedus.palash.dev",
-<<<<<<< HEAD
-=======
       "https://piped.waffle.wiki",
       "https://watch.whatever.social",
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
       "https://yt.jae.fi",
       "https://piped.mint.lgbt",
       "https://piped.privacy.com.de",
       "https://piped.esmailelbob.xyz",
-      "https://piped.projectsegfau.lt/"
+      "https://piped.projectsegfau.lt"
     ],
     "tor": [
       "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion"
@@ -173,7 +170,6 @@
       "https://nitter.projectsegfau.lt",
       "https://singapore.unofficialbird.com",
       "https://twt.funami.tech",
-<<<<<<< HEAD
       "https://nitter.fprivacy.com",
       "https://canada.unofficialbird.com",
       "https://india.unofficialbird.com",
@@ -181,9 +177,6 @@
       "https://uk.unofficialbird.com",
       "https://n.l5.ca",
       "https://nitter.slipfox.xyz"
-=======
-      "https://nitter.fprivacy.com"
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
     ],
     "tor": [
       "http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion",
@@ -463,24 +456,11 @@
     "loki": []
   },
   "searx": {
-<<<<<<< HEAD
-=======
-    "tor": [
-      "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
-      "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
-      "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
-      "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
-      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
-    ],
-    "i2p": [
-      "http://ransack.i2p",
-      "http://mqamk4cfykdvhw5kjez2gnvse56gmnqxn7vkvvbuor4k4j2lbbnq.b32.i2p"
-    ],
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
     "normal": [
       "https://anon.sx",
       "https://dynabyte.ca",
       "https://jsearch.pw",
+      "https://private-searx.ml",
       "https://search.ethibox.fr",
       "https://search.snopyta.org",
       "https://search.stinpriza.org",
@@ -506,7 +486,6 @@
       "https://searx.tuxcloud.net",
       "https://searx.tyil.nl",
       "https://searx.vanwa.tech",
-      "https://searx.vimproved.me",
       "https://searx.webheberg.info",
       "https://searx.xyz",
       "https://searx.zapashcanon.fr",
@@ -520,27 +499,14 @@
       "https://searx.roflcopter.fr"
     ],
     "tor": [
-<<<<<<< HEAD
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
-      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
+      "http://x5gdjh6t7kb4yubpufhtc3l3df2acev3emxdasd5vyuyoon5rzf5zkyd.onion",
+      "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
-      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
-=======
-      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
-      "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
-      "http://x5gdjh6t7kb4yubpufhtc3l3df2acev3emxdasd5vyuyoon5rzf5zkyd.onion",
-      "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
-      "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
-      "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
-      "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
-      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
-      "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
-      "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
-      "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
-      "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion"
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
+      "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -559,7 +525,6 @@
       "https://opnxng.com",
       "https://paulgo.io",
       "https://priv.au",
-      "https://private-searx.ml",
       "https://privatus.live",
       "https://s.frlt.one",
       "https://s.zhaocloud.net",
@@ -580,10 +545,7 @@
       "https://search.sapti.me",
       "https://search.teamriverbubbles.com",
       "https://search.unlocked.link",
-<<<<<<< HEAD
       "https://search.vidhukant.xyz",
-=======
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
       "https://search.zzls.xyz",
       "https://searx.be",
       "https://searx.becomesovran.com",
@@ -606,6 +568,7 @@
       "https://searx.sev.monster",
       "https://searx.slipfox.xyz/searx",
       "https://searx.tiekoetter.com",
+      "https://searx.vimproved.me",
       "https://searx.youshitsune.me",
       "https://searx.zcyph.cc",
       "https://searxng.au/searx",
@@ -619,15 +582,13 @@
       "https://xcxc.ml"
     ],
     "tor": [
+      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
-      "http://x5gdjh6t7kb4yubpufhtc3l3df2acev3emxdasd5vyuyoon5rzf5zkyd.onion",
-      "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
-      "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
       "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
       "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
       "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion"
@@ -689,7 +650,6 @@
       "http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
       "http://rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
       "http://rimgo.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
-<<<<<<< HEAD
     ],
     "i2p": [],
     "loki": []
@@ -702,8 +662,6 @@
       "https://lbry.mutahar.rocks",
       "https://librarian.esmailelbob.xyz",
       "https://lbry.vern.cc"
-=======
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
     ],
     "tor": [
       "http://librarian.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
@@ -713,7 +671,6 @@
     "loki": []
   },
   "peertube": [
-<<<<<<< HEAD
     "https://pire.artisanlogiciel.net",
     "https://trutube.xyz",
     "https://tube-test.apps.education.fr",
@@ -809,8 +766,6 @@
     "https://peertube.otakufarms.com",
     "https://tube.motuhake.xyz",
     "https://pt.m0r016.net",
-=======
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
     "https://hitchtube.fr",
     "https://video.fox-romka.ru",
     "https://peertube.ctrl-c.liu.se",
@@ -981,10 +936,6 @@
     "https://tube.globalfrens.com",
     "https://peertube.hacknews.pmdcollab.org",
     "https://freetubes.nohost.me",
-<<<<<<< HEAD
-=======
-    "https://video.simplex-software.ru",
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
     "https://video.snug.moe",
     "https://video.avant-le-strike.buzz",
     "https://videos.ritimo.org",
-- 
cgit 1.4.1


From f19d203e9e3a26810b730e9a8ea77ce3d18eb26d Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Mon, 25 Jul 2022 22:33:38 +0000
Subject: update instances

---
 src/instances/blacklist.json |  1 +
 src/instances/data.json      | 41 +++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 20 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index df438be1..54b7fe0b 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -13,6 +13,7 @@
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
     "https://nitter.moomoo.me",
+    "https://nitter.it",
     "https://notabird.site",
     "https://fuckthesacklers.network",
     "https://nitter.winscloud.net",
diff --git a/src/instances/data.json b/src/instances/data.json
index 0567849f..b74d0622 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -8,6 +8,7 @@
       "https://inv.riverside.rocks",
       "https://invidious.osi.kr",
       "https://y.com.sb",
+      "https://yt.artemislena.eu",
       "https://invidious.flokinet.to",
       "https://invidious.sethforprivacy.com",
       "https://invidious.tiekoetter.com",
@@ -15,12 +16,12 @@
       "https://invidious.projectsegfau.lt",
       "https://inv.vern.cc",
       "https://invidious.nerdvpn.de",
+      "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
+      "https://invidious.weblibre.org",
       "https://youtube.076.ne.jp",
       "https://invidious.esmailelbob.xyz",
-      "https://invidious.weblibre.org",
-      "https://invidious.namazso.eu",
-      "https://yt.artemislena.eu"
+      "https://invidious.namazso.eu"
     ],
     "tor": [
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
@@ -394,7 +395,8 @@
       "https://wuetre.herokuapp.com",
       "https://quetreus.herokuapp.com",
       "https://quetre.tokhmi.xyz",
-      "https://quetre.projectsegfau.lt"
+      "https://quetre.projectsegfau.lt",
+      "https://quetre.esmailelbob.xyz"
     ],
     "tor": [],
     "i2p": [],
@@ -405,7 +407,8 @@
       "https://libremdb.herokuapp.com",
       "https://libremdb.pussthecat.org",
       "https://libremdbeu.herokuapp.com",
-      "https://lmdb.tokhmi.xyz"
+      "https://lmdb.tokhmi.xyz",
+      "https://libremdb.esmailelbob.xyz"
     ],
     "tor": [],
     "i2p": [],
@@ -460,7 +463,6 @@
       "https://anon.sx",
       "https://dynabyte.ca",
       "https://jsearch.pw",
-      "https://private-searx.ml",
       "https://search.ethibox.fr",
       "https://search.snopyta.org",
       "https://search.stinpriza.org",
@@ -476,6 +478,7 @@
       "https://searx.netzspielplatz.de",
       "https://searx.nixnet.services",
       "https://searx.org",
+      "https://searx.priv.pw",
       "https://searx.pwoss.org",
       "https://searx.rasp.fr",
       "https://searx.ru",
@@ -500,13 +503,10 @@
     ],
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
-      "http://x5gdjh6t7kb4yubpufhtc3l3df2acev3emxdasd5vyuyoon5rzf5zkyd.onion",
-      "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
-      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
-      "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion"
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -528,6 +528,7 @@
       "https://privatus.live",
       "https://s.frlt.one",
       "https://s.zhaocloud.net",
+      "https://saber.tk",
       "https://search.affusio.com",
       "https://search.ashs.club",
       "https://search.bingowaves.xyz",
@@ -556,12 +557,10 @@
       "https://searx.fi",
       "https://searx.fmac.xyz",
       "https://searx.gnous.eu",
-      "https://searx.loafland.xyz",
       "https://searx.mha.fi",
       "https://searx.mistli.net",
       "https://searx.namejeff.xyz",
       "https://searx.orion-hub.fr",
-      "https://searx.priv.pw",
       "https://searx.prvcy.eu",
       "https://searx.rimkus.it",
       "https://searx.sethforprivacy.com",
@@ -584,11 +583,13 @@
     "tor": [
       "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
+      "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
+      "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
       "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
       "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
       "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion"
@@ -671,6 +672,7 @@
     "loki": []
   },
   "peertube": [
+    "https://soberania.tv",
     "https://pire.artisanlogiciel.net",
     "https://trutube.xyz",
     "https://tube-test.apps.education.fr",
@@ -1025,7 +1027,6 @@
     "https://peertube.marud.fr",
     "https://freetubehub.live",
     "https://peertube.librelabucm.org",
-    "https://tube4.apolut.net",
     "https://mtube.mooo.com",
     "https://skeptube.fr",
     "https://tube.villejuif.fr",
@@ -1042,7 +1043,6 @@
     "https://open.movie",
     "https://tube.rfc1149.net",
     "https://tube.radiomercure.fr",
-    "https://medias.debrouillonet.org",
     "https://peertube.1984.cz",
     "https://tube.sp4ke.com",
     "https://pt.nix.uno",
@@ -1074,7 +1074,6 @@
     "https://dud-video.inf.tu-dresden.de",
     "https://media-test.interior.edu.uy",
     "https://media.interior.edu.uy",
-    "https://peertube.la-scic.fr",
     "https://phoenixproject.group",
     "https://peertube.sebu77.com",
     "https://www.orion-hub.fr",
@@ -1132,7 +1131,6 @@
     "https://tube.geekyboo.net",
     "https://notretube.asselma.eu",
     "https://canal.facil.services",
-    "https://ukva.li",
     "https://pt.gordons.gen.nz",
     "https://tube.misterbanal.net",
     "https://peertube.fomin.site",
@@ -1228,7 +1226,6 @@
     "https://kino.kompot.si",
     "https://tube.kockatoo.org",
     "https://peertube.cabaal.net",
-    "https://sovran.video",
     "https://stream.k-prod.fr",
     "https://tube.tylerdavis.xyz",
     "https://video.marcorennmaus.de",
@@ -1443,7 +1440,6 @@
     "https://peertube.tspu.edu.ru",
     "https://p.lu",
     "https://serv3.wiki-tube.de",
-    "https://serv1.wiki-tube.de",
     "https://video.lavolte.net",
     "https://peertube.public.cat",
     "https://peertube.anduin.net",
@@ -1511,7 +1507,6 @@
     "https://video.pony.gallery",
     "https://tube.skrep.in",
     "https://tube.others.social",
-    "https://videos.ubuntu-paris.org",
     "https://tube-poitiers.beta.education.fr",
     "https://vid.wildeboer.net",
     "https://battlepenguin.video",
@@ -1715,6 +1710,12 @@
     "https://peertube.qtg.fr",
     "https://tube.p2p.legal",
     "https://troll.tv",
-    "https://videos.iut-orsay.fr"
+    "https://videos.iut-orsay.fr",
+    "https://peertube.solidev.net",
+    "https://videos.cemea.org",
+    "https://video.passageenseine.fr",
+    "https://peertube.touhoppai.moe",
+    "https://share.tube",
+    "https://peertube.heraut.eu"
   ]
 }
\ No newline at end of file
-- 
cgit 1.4.1


From b995308add8c5e522966a2b2e2e65dc685b44ef2 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Thu, 28 Jul 2022 22:35:02 +0000
Subject: update instances

---
 src/instances/blacklist.json |  11 ++--
 src/instances/data.json      | 122 +++++++++++++++++++++++++++++++------------
 2 files changed, 95 insertions(+), 38 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 54b7fe0b..58a6a82d 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -4,16 +4,14 @@
     "https://piped.kavin.rocks",
     "https://piped.tokhmi.xyz",
     "https://piped.moomoo.me",
-    "https://piped.syncpundit.com",
     "https://piped.mha.fi",
-    "https://piped.shimul.me",
+    "https://us-piped.shimul.me",
     "https://pipedus.palash.dev",
     "https://piped.waffle.wiki",
     "https://watch.whatever.social",
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
     "https://nitter.moomoo.me",
-    "https://nitter.it",
     "https://notabird.site",
     "https://fuckthesacklers.network",
     "https://nitter.winscloud.net",
@@ -44,6 +42,8 @@
     "https://teddit.garudalinux.org",
     "https://tedd.it",
     "https://wiki.604kph.xyz",
+    "https://lingva.garudalinux.org",
+    "https://translate.dr460nf1r3.org",
     "https://searx.org",
     "https://searx.run",
     "https://search.albony.xyz",
@@ -51,9 +51,10 @@
     "https://search.dr460nf1r3.org",
     "https://search.wef.lol",
     "https://i.actionsack.com",
-    "https://rimgo.encrypted-data.xyz"
+    "https://rimgo.encrypted-data.xyz",
+    "https://beatbump.ml"
   ],
   "authenticate": [
-    "https://nitter.nixnet.services"
+    "https://nitter:nitter@nitter.nixnet.services"
   ]
 }
\ No newline at end of file
diff --git a/src/instances/data.json b/src/instances/data.json
index b74d0622..a983ab8c 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -2,11 +2,9 @@
   "invidious": {
     "normal": [
       "https://yewtu.be",
-      "https://vid.puffyan.us",
       "https://invidious.snopyta.org",
       "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
-      "https://invidious.osi.kr",
       "https://y.com.sb",
       "https://yt.artemislena.eu",
       "https://invidious.flokinet.to",
@@ -18,10 +16,12 @@
       "https://invidious.nerdvpn.de",
       "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
-      "https://invidious.weblibre.org",
       "https://youtube.076.ne.jp",
       "https://invidious.esmailelbob.xyz",
-      "https://invidious.namazso.eu"
+      "https://invidious.weblibre.org",
+      "https://vid.puffyan.us",
+      "https://invidious.namazso.eu",
+      "https://invidious.osi.kr"
     ],
     "tor": [
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
@@ -43,21 +43,17 @@
       "https://piped.tokhmi.xyz",
       "https://piped.moomoo.me",
       "https://il.ax",
-      "https://piped.syncpundit.com",
       "https://piped.mha.fi",
-      "https://piped.shimul.me",
+      "https://us-piped.shimul.me",
       "https://pipedus.palash.dev",
       "https://piped.waffle.wiki",
       "https://watch.whatever.social",
       "https://yt.jae.fi",
-      "https://piped.mint.lgbt",
       "https://piped.privacy.com.de",
       "https://piped.esmailelbob.xyz",
       "https://piped.projectsegfau.lt"
     ],
-    "tor": [
-      "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion"
-    ],
+    "tor": [],
     "i2p": [],
     "loki": []
   },
@@ -72,6 +68,17 @@
     "i2p": [],
     "loki": []
   },
+  "cloudtube": {
+    "normal": [
+      "https://tube.cadence.moe",
+      "https://yt.beparanoid.de"
+    ],
+    "tor": [
+      "http://yt.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion"
+    ],
+    "i2p": [],
+    "loki": []
+  },
   "proxiTok": {
     "normal": [
       "https://proxitok.herokuapp.com",
@@ -112,7 +119,7 @@
       "https://nitter.net",
       "https://nitter.42l.fr",
       "https://nitter.pussthecat.org",
-      "https://nitter.nixnet.services",
+      "https://nitter:nitter@nitter.nixnet.services",
       "https://nitter.fdn.fr",
       "https://nitter.1d4.us",
       "https://nitter.kavin.rocks",
@@ -180,12 +187,8 @@
       "https://nitter.slipfox.xyz"
     ],
     "tor": [
-      "http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion",
-      "http://nitter.l4qlywnpwqsluw65ts7md3khrivpirse744un3x7mlskqauz5pyuzgqd.onion",
       "http://nitter7bryz3jv7e3uekphigvmoyoem4al3fynerxkj22dmoxoq553qd.onion",
       "http://npf37k3mtzwxreiw52ccs5ay4e6qt2fkcs2ndieurdyn2cuzzsfyfvid.onion",
-      "http://nitter.v6vgyqpa7yefkorazmg5d5fimstmvm2vtbirt6676mt7qmllrcnwycqd.onion",
-      "http://i23nv6w3juvzlw32xzoxcqzktegd4i4fu3nmnc2ewv4ggiu4ledwklad.onion",
       "http://26oq3gioiwcmfojub37nz5gzbkdiqp7fue5kvye7d4txv4ny6fb4wwid.onion",
       "http://vfaomgh4jxphpbdfizkm5gbtjahmei234giqj4facbwhrfjtcldauqad.onion",
       "http://iwgu3cv7ywf3gssed5iqtavmrlszgsxazkmwwnt4h2kdait75thdyrqd.onion",
@@ -206,8 +209,14 @@
       "http://aaaaaxx74hbzeibageieowryhsqvimbdiitfkfe47tvgawkwkjh3coqd.onion",
       "http://wiio4sgs4247brk7hj6qck2jxnvldwfdbguigc5ivpxrsegnliyfvuqd.onion"
     ],
-    "i2p": [],
-    "loki": []
+    "i2p": [
+      "http://axd6uavsstsrvstva4mzlzh4ct76rc6zdug3nxdgeitrzczhzf4q.b32.i2p",
+      "http://u6ikd6zndl3c4dsdq4mmujpntgeevdk5qzkfb57r4tnfeccrn2qa.b32.i2p",
+      "http://gseczlzmiv23p5vhsktyd7whquq2uy3c5fgkmdohh453qp3daoua.b32.i2p"
+    ],
+    "loki": [
+      "http://nitter.priv.loki"
+    ]
   },
   "bibliogram": {
     "normal": [
@@ -370,6 +379,7 @@
       "http://c2pesewpalbi6lbfc5hf53q4g3ovnxe4s7tfa6k2aqkf7jd7a7dlz5ad.onion"
     ],
     "i2p": [
+      "http://wikiless.i2p",
       "http://hflqp2ejxygpj6cdwo3ogfieqmxw3b56w7dblt7bor2ltwk6kcfa.b32.i2p",
       "http://x33lx4h6d7h6xs4eiqwhvaxn3ea5gn2ifmu3jobnvuvn4k4aej7a.b32.i2p"
     ],
@@ -452,7 +462,10 @@
       "https://lingva.pussthecat.org",
       "https://translate.plausibility.cloud",
       "https://lingva.lunar.icu",
-      "https://lingva.opnxng.com"
+      "https://lingva.opnxng.com",
+      "https://translate.projectsegfau.lt",
+      "https://lingva.garudalinux.org",
+      "https://translate.dr460nf1r3.org"
     ],
     "tor": [],
     "i2p": [],
@@ -460,8 +473,11 @@
   },
   "searx": {
     "normal": [
+      "http://ransack.i2p",
+      "http://mqamk4cfykdvhw5kjez2gnvse56gmnqxn7vkvvbuor4k4j2lbbnq.b32.i2p",
       "https://anon.sx",
       "https://dynabyte.ca",
+      "https://icanfindit.online",
       "https://jsearch.pw",
       "https://search.ethibox.fr",
       "https://search.snopyta.org",
@@ -478,8 +494,6 @@
       "https://searx.netzspielplatz.de",
       "https://searx.nixnet.services",
       "https://searx.org",
-      "https://searx.priv.pw",
-      "https://searx.pwoss.org",
       "https://searx.rasp.fr",
       "https://searx.ru",
       "https://searx.run",
@@ -491,6 +505,7 @@
       "https://searx.vanwa.tech",
       "https://searx.webheberg.info",
       "https://searx.xyz",
+      "https://searx.youshitsune.me",
       "https://searx.zapashcanon.fr",
       "https://searxng.ir",
       "https://spot.ecloud.global",
@@ -506,12 +521,10 @@
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
-      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
-    ],
-    "i2p": [
-      "http://ransack.i2p",
-      "http://mqamk4cfykdvhw5kjez2gnvse56gmnqxn7vkvvbuor4k4j2lbbnq.b32.i2p"
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
+      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
     ],
+    "i2p": [],
     "loki": []
   },
   "searxng": {
@@ -519,7 +532,6 @@
       "https://darmarit.org/searx",
       "https://de.xcxc.ml",
       "https://etsi.me",
-      "https://icanfindit.online",
       "https://jackgoss.xyz",
       "https://northboot.xyz",
       "https://opnxng.com",
@@ -561,6 +573,7 @@
       "https://searx.mistli.net",
       "https://searx.namejeff.xyz",
       "https://searx.orion-hub.fr",
+      "https://searx.priv.pw",
       "https://searx.prvcy.eu",
       "https://searx.rimkus.it",
       "https://searx.sethforprivacy.com",
@@ -568,17 +581,18 @@
       "https://searx.slipfox.xyz/searx",
       "https://searx.tiekoetter.com",
       "https://searx.vimproved.me",
-      "https://searx.youshitsune.me",
       "https://searx.zcyph.cc",
       "https://searxng.au/searx",
       "https://searxng.tordenskjold.de",
       "https://searxng.zackptg5.com",
       "https://serx.ml",
+      "https://sh0.it",
       "https://srx.cosmohub.io",
       "https://swag.pw",
       "https://www.gruble.de",
       "https://www.webrats.xyz",
-      "https://xcxc.ml"
+      "https://xcxc.ml",
+      "https://xo.wtf"
     ],
     "tor": [
       "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
@@ -587,7 +601,6 @@
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
-      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
       "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
@@ -637,6 +650,7 @@
     "normal": [
       "https://i.bcow.xyz",
       "https://rimgo.pussthecat.org",
+      "https://rimgo.totaldarkness.net",
       "https://rimgo.bus-hit.me",
       "https://rimgo.esmailelbob.xyz",
       "https://rimgo.lunar.icu",
@@ -671,6 +685,48 @@
     "i2p": [],
     "loki": []
   },
+  "neuters": {
+    "normal": [
+      "https://neuters.de"
+    ],
+    "tor": [],
+    "i2p": [],
+    "loki": []
+  },
+  "beatbump": {
+    "normal": [
+      "https://beatbump.ml"
+    ],
+    "tor": [],
+    "i2p": [],
+    "loki": []
+  },
+  "hyperpipe": {
+    "normal": [
+      "https://hyperpipe.surge.sh"
+    ],
+    "tor": [],
+    "i2p": [],
+    "loki": []
+  },
+  "facil": {
+    "normal": [
+      "https://facilmap.org"
+    ],
+    "tor": [],
+    "i2p": [],
+    "loki": []
+  },
+  "simpleertube": {
+    "normal": [
+      "https://tube.simple-web.org",
+      "https://simpleertube.esmailelbob.xyz",
+      "https://stube.tokhmi.xyz"
+    ],
+    "tor": [],
+    "i2p": [],
+    "loki": []
+  },
   "peertube": [
     "https://soberania.tv",
     "https://pire.artisanlogiciel.net",
@@ -795,7 +851,6 @@
     "https://peertube.chaunchy.com",
     "https://tube.vrpnet.org",
     "https://video.tii.space",
-    "https://peertube.familleboisteau.fr",
     "https://peertube.inubo.ch",
     "https://nightshift.minnix.dev",
     "https://tube.friloux.me",
@@ -931,7 +986,6 @@
     "https://videos.slownewsdayshow.com",
     "https://videos.sarcasmstardust.com",
     "https://videos.factsonthegroundshow.com",
-    "https://video.regenpfeifer.net",
     "https://video.pe6.eu",
     "https://tv.santic-zombie.ru",
     "https://tube.sleeping.town",
@@ -1517,7 +1571,6 @@
     "https://peertube.davigge.com",
     "https://vod.ksite.de",
     "https://tube.grin.hu",
-    "https://media.inno3.cricket",
     "https://tube.cryptography.dog",
     "https://peertube.zergy.net",
     "https://vid.ncrypt.at",
@@ -1716,6 +1769,9 @@
     "https://video.passageenseine.fr",
     "https://peertube.touhoppai.moe",
     "https://share.tube",
-    "https://peertube.heraut.eu"
+    "https://peertube.heraut.eu",
+    "https://peertube.gegeweb.eu",
+    "https://framatube.org",
+    "https://tube.conferences-gesticulees.net"
   ]
 }
\ No newline at end of file
-- 
cgit 1.4.1


From 0b6c71778fa380849ab1949fa4ba1b999a911cdb Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sun, 31 Jul 2022 22:35:05 +0000
Subject: update instances

---
 src/instances/blacklist.json |  2 --
 src/instances/data.json      | 56 ++++++++++++++++++++++++--------------------
 2 files changed, 30 insertions(+), 28 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 58a6a82d..ec77035a 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -11,7 +11,6 @@
     "https://watch.whatever.social",
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
-    "https://nitter.moomoo.me",
     "https://notabird.site",
     "https://fuckthesacklers.network",
     "https://nitter.winscloud.net",
@@ -24,7 +23,6 @@
     "https://bib.actionsack.com",
     "https://libreddit.domain.glass",
     "https://r.nf",
-    "https://libreddit.flux.industries",
     "https://lr.oversold.host",
     "https://libreddit.hu",
     "https://lr.stilic.ml",
diff --git a/src/instances/data.json b/src/instances/data.json
index a983ab8c..0b95bda7 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -2,9 +2,11 @@
   "invidious": {
     "normal": [
       "https://yewtu.be",
+      "https://vid.puffyan.us",
       "https://invidious.snopyta.org",
       "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
+      "https://invidious.osi.kr",
       "https://y.com.sb",
       "https://yt.artemislena.eu",
       "https://invidious.flokinet.to",
@@ -16,12 +18,10 @@
       "https://invidious.nerdvpn.de",
       "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
-      "https://youtube.076.ne.jp",
-      "https://invidious.esmailelbob.xyz",
       "https://invidious.weblibre.org",
-      "https://vid.puffyan.us",
+      "https://youtube.076.ne.jp",
       "https://invidious.namazso.eu",
-      "https://invidious.osi.kr"
+      "https://invidious.esmailelbob.xyz"
     ],
     "tor": [
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
@@ -49,6 +49,7 @@
       "https://piped.waffle.wiki",
       "https://watch.whatever.social",
       "https://yt.jae.fi",
+      "https://piped.mint.lgbt",
       "https://piped.privacy.com.de",
       "https://piped.esmailelbob.xyz",
       "https://piped.projectsegfau.lt"
@@ -391,7 +392,8 @@
       "https://scribe.nixnet.services",
       "https://scribe.citizen4.eu",
       "https://scribe.bus-hit.me",
-      "https://scribe.froth.zone"
+      "https://scribe.froth.zone",
+      "https://scribe.esmailelbob.xyz"
     ],
     "tor": [],
     "i2p": [],
@@ -473,11 +475,8 @@
   },
   "searx": {
     "normal": [
-      "http://ransack.i2p",
-      "http://mqamk4cfykdvhw5kjez2gnvse56gmnqxn7vkvvbuor4k4j2lbbnq.b32.i2p",
       "https://anon.sx",
       "https://dynabyte.ca",
-      "https://icanfindit.online",
       "https://jsearch.pw",
       "https://search.ethibox.fr",
       "https://search.snopyta.org",
@@ -486,6 +485,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",
@@ -505,7 +505,6 @@
       "https://searx.vanwa.tech",
       "https://searx.webheberg.info",
       "https://searx.xyz",
-      "https://searx.youshitsune.me",
       "https://searx.zapashcanon.fr",
       "https://searxng.ir",
       "https://spot.ecloud.global",
@@ -522,9 +521,12 @@
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
       "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
-      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
+      "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx"
+    ],
+    "i2p": [
+      "http://ransack.i2p",
+      "http://mqamk4cfykdvhw5kjez2gnvse56gmnqxn7vkvvbuor4k4j2lbbnq.b32.i2p"
     ],
-    "i2p": [],
     "loki": []
   },
   "searxng": {
@@ -563,7 +565,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",
@@ -597,13 +598,14 @@
     "tor": [
       "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
+      "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
       "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
+      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
-      "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
       "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
       "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion"
     ],
@@ -676,11 +678,13 @@
       "https://librarian.pussthecat.org",
       "https://lbry.mutahar.rocks",
       "https://librarian.esmailelbob.xyz",
-      "https://lbry.vern.cc"
+      "https://lbry.vern.cc",
+      "https://lbry.slipfox.xyz"
     ],
     "tor": [
       "http://librarian.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
-      "http://lbry.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
+      "http://lbry.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
+      "http://5znbzx2xcymhddzekfjib3isgqq4ilcyxa2bsq6vqmnvbtgu4f776lqd.onion"
     ],
     "i2p": [],
     "loki": []
@@ -703,7 +707,8 @@
   },
   "hyperpipe": {
     "normal": [
-      "https://hyperpipe.surge.sh"
+      "https://hyperpipe.surge.sh",
+      "https://hyperpipe.esmailelbob.xyz"
     ],
     "tor": [],
     "i2p": [],
@@ -728,6 +733,9 @@
     "loki": []
   },
   "peertube": [
+    "https://www.neptube.io",
+    "https://tube.ghk-academy.info",
+    "https://pcbu.nl",
     "https://soberania.tv",
     "https://pire.artisanlogiciel.net",
     "https://trutube.xyz",
@@ -784,7 +792,6 @@
     "https://video.occm.cc",
     "https://peertube.viviers-fibre.net",
     "https://tube-action-educative.apps.education.fr",
-    "https://themadlads.live",
     "https://jahve.pl",
     "https://videos.yesil.club",
     "https://peertube.adjutor.xyz",
@@ -843,7 +850,6 @@
     "https://videos.neongarden.life",
     "https://video.vaku.org.ua",
     "https://videos.trom.lt",
-    "https://videod.fr",
     "https://vid.mkp.ca",
     "https://jupiter.tube",
     "https://tuvideo.encanarias.info",
@@ -905,7 +911,6 @@
     "https://tube.rooty.fr",
     "https://tube.dnet.one",
     "https://peertube.io",
-    "https://peertube.echelon4.space",
     "https://www.kotikoff.net",
     "https://peertube.nz",
     "https://videos.grafo.zone",
@@ -919,7 +924,6 @@
     "https://krdtube.org",
     "https://peertube.elforcer.ru",
     "https://tubocatodico.bida.im",
-    "https://linhtran.eu",
     "https://torstenwitte.peertube-host.de",
     "https://peertube.hackerfraternity.org",
     "https://openmedia.edunova.it",
@@ -997,7 +1001,6 @@
     "https://videos.ritimo.org",
     "https://videos.ephphatha.church",
     "https://video.cerclearistote.com",
-    "https://computerstuff.mooo.com",
     "https://video.greenmycity.eu",
     "https://przej.me",
     "https://pt.mezzo.moe",
@@ -1098,7 +1101,6 @@
     "https://tube.rfc1149.net",
     "https://tube.radiomercure.fr",
     "https://peertube.1984.cz",
-    "https://tube.sp4ke.com",
     "https://pt.nix.uno",
     "https://videos.openmandriva.org",
     "https://video.vanderwarker.photos",
@@ -1237,7 +1239,6 @@
     "https://tube.okcinfo.news",
     "https://www.rocaguinarda.tv",
     "https://videos.wirtube.de",
-    "https://tube.tinfoil-hat.net",
     "https://livegram.net",
     "https://video.ustim.ru",
     "https://merci-la-police.fr",
@@ -1435,9 +1436,7 @@
     "https://video.taboulisme.com",
     "https://media.undeadnetwork.de",
     "https://tube.dragonpsi.xyz",
-    "https://veezee.tube",
     "https://peertube.nicolastissot.fr",
-    "https://s2.veezee.tube",
     "https://tubes.jodh.us",
     "https://tube.lucie-philou.com",
     "https://video.odayacres.farm",
@@ -1772,6 +1771,11 @@
     "https://peertube.heraut.eu",
     "https://peertube.gegeweb.eu",
     "https://framatube.org",
-    "https://tube.conferences-gesticulees.net"
+    "https://tube.conferences-gesticulees.net",
+    "https://peertube.datagueule.tv",
+    "https://video.lqdn.fr",
+    "https://peertube3.cpy.re",
+    "https://peertube2.cpy.re",
+    "https://peertube.cpy.re"
   ]
 }
\ No newline at end of file
-- 
cgit 1.4.1


From dd07804a31ca11e9b951c31d9d2b3535817bbac3 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Mon, 1 Aug 2022 22:39:10 +0000
Subject: update instances

---
 src/instances/data.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/data.json b/src/instances/data.json
index 0b95bda7..822d8c92 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -3,7 +3,6 @@
     "normal": [
       "https://yewtu.be",
       "https://vid.puffyan.us",
-      "https://invidious.snopyta.org",
       "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
       "https://invidious.osi.kr",
@@ -18,10 +17,11 @@
       "https://invidious.nerdvpn.de",
       "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
-      "https://invidious.weblibre.org",
       "https://youtube.076.ne.jp",
-      "https://invidious.namazso.eu",
-      "https://invidious.esmailelbob.xyz"
+      "https://invidious.weblibre.org",
+      "https://invidious.snopyta.org",
+      "https://invidious.esmailelbob.xyz",
+      "https://invidious.namazso.eu"
     ],
     "tor": [
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
@@ -49,8 +49,6 @@
       "https://piped.waffle.wiki",
       "https://watch.whatever.social",
       "https://yt.jae.fi",
-      "https://piped.mint.lgbt",
-      "https://piped.privacy.com.de",
       "https://piped.esmailelbob.xyz",
       "https://piped.projectsegfau.lt"
     ],
@@ -485,7 +483,6 @@
       "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",
@@ -520,8 +517,7 @@
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
-      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
-      "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx"
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -543,6 +539,7 @@
       "https://s.frlt.one",
       "https://s.zhaocloud.net",
       "https://saber.tk",
+      "https://search.0relay.com",
       "https://search.affusio.com",
       "https://search.ashs.club",
       "https://search.bingowaves.xyz",
@@ -565,6 +562,7 @@
       "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",
@@ -606,6 +604,7 @@
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
+      "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
       "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
       "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion"
     ],
@@ -1020,7 +1019,6 @@
     "https://videos.yeswiki.net",
     "https://tube.lrk.sh",
     "https://peertube.autogestioncitoyenne.org",
-    "https://stream.dynacloud.ynh.fr",
     "https://video.r3s.nrw",
     "https://peertube.semweb.pro",
     "https://poast.tv",
-- 
cgit 1.4.1


From 790d4632fbc994490f73330f6952eb66b7c04ce0 Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Tue, 2 Aug 2022 18:09:24 +0300
Subject: Some tweaks on bibliogram settings

---
 src/assets/javascripts/instagram.js |  23 +-----
 src/assets/javascripts/utils.js     | 160 ++++++++++--------------------------
 src/instances/blacklist.json        |  37 +++++++--
 src/instances/data.json             | 146 ++++++++++++++++++++++----------
 4 files changed, 178 insertions(+), 188 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/assets/javascripts/instagram.js b/src/assets/javascripts/instagram.js
index 1690c84a..00042074 100644
--- a/src/assets/javascripts/instagram.js
+++ b/src/assets/javascripts/instagram.js
@@ -102,32 +102,12 @@ function initBibliogramPreferences(test, from) {
 			if ((checkedInstances.length === 0 && protocolFallback) || protocol == "normal") {
 				checkedInstances = [...bibliogramNormalRedirectsChecks, ...bibliogramNormalCustomRedirects]
 			}
-			utils.getPreferencesFromToken("bibliogram", from, checkedInstances, "settings", "/settings.json")
-			utils.setPreferencesFromToken("bibliogram", checkedInstances, "settings")
+			await utils.getPreferencesFromToken("bibliogram", from, checkedInstances, "settings", "settings.json")
 		}
 		resolve(true)
 	})
 }
 
-function setBibliogramPreferences() {
-	return new Promise(async resolve => {
-		await init()
-		if (disableInstagram || protocol === undefined) {
-			resolve()
-			return
-		}
-		let checkedInstances = []
-		if (protocol == "loki") checkedInstances = [...bibliogramLokiCustomRedirects]
-		else if (protocol == "i2p") checkedInstances = [...bibliogramI2pCustomRedirects]
-		else if (protocol == "tor") checkedInstances = [...bibliogramTorRedirectsChecks, ...bibliogramTorCustomRedirects]
-		if ((checkedInstances.length === 0 && protocolFallback) || protocol == "normal") {
-			checkedInstances = [...bibliogramNormalRedirectsChecks, ...bibliogramNormalCustomRedirects]
-		}
-		utils.setPreferencesFromToken("bibliogram", checkedInstances, "settings")
-		resolve()
-	})
-}
-
 function all() {
 	return [
 		...bibliogramNormalRedirectsChecks,
@@ -254,7 +234,6 @@ function initDefaults() {
 export default {
 	setRedirects,
 	initBibliogramPreferences,
-	setBibliogramPreferences,
 	reverse,
 	redirect,
 	initDefaults,
diff --git a/src/assets/javascripts/utils.js b/src/assets/javascripts/utils.js
index 8ef25dc0..98dbe3da 100644
--- a/src/assets/javascripts/utils.js
+++ b/src/assets/javascripts/utils.js
@@ -315,19 +315,19 @@ function copyCookie(frontend, targetUrl, urls, name) {
 						for (const url of urls) {
 							const setQuery = r.firstPartyIsolate
 								? {
-										url: url,
-										name: name,
-										value: cookie.value,
-										secure: true,
-										firstPartyDomain: new URL(url).hostname,
-								  }
+									url: url,
+									name: name,
+									value: cookie.value,
+									secure: true,
+									firstPartyDomain: new URL(url).hostname,
+								}
 								: {
-										url: url,
-										name: name,
-										value: cookie.value,
-										secure: true,
-										expirationDate: cookie.expirationDate,
-								  }
+									url: url,
+									name: name,
+									value: cookie.value,
+									secure: true,
+									expirationDate: cookie.expirationDate,
+								}
 							browser.cookies.set(setQuery, () => browser.storage.local.set({ [`${frontend}_${name}`]: cookie }, () => resolve()))
 						}
 						break
@@ -346,20 +346,20 @@ function getCookiesFromStorage(frontend, urls, name) {
 		for (const url of urls) {
 			let query = r.firstPartyIsolate
 				? {
-						url: url,
-						name: cookie.name,
-						value: cookie.value,
-						secure: true,
-						expirationDate: null,
-						firstPartyDomain: new URL(url).hostname,
-				  }
+					url: url,
+					name: cookie.name,
+					value: cookie.value,
+					secure: true,
+					expirationDate: null,
+					firstPartyDomain: new URL(url).hostname,
+				}
 				: {
-						url: url,
-						name: cookie.name,
-						value: cookie.value,
-						secure: true,
-						expirationDate: cookie.expirationDate,
-				  }
+					url: url,
+					name: cookie.name,
+					value: cookie.value,
+					secure: true,
+					expirationDate: cookie.expirationDate,
+				}
 			browser.cookies.set(query)
 		}
 	})
@@ -368,97 +368,26 @@ function getCookiesFromStorage(frontend, urls, name) {
 function getPreferencesFromToken(frontend, targetUrl, urls, name, endpoint) {
 	return new Promise(resolve => {
 		browser.storage.local.get("firstPartyIsolate", r => {
-			let query
-			if (!r.firstPartyIsolate) query = { url: protocolHost(targetUrl), name: name }
-			else
-				query = {
-					url: protocolHost(targetUrl),
-					name: name,
-					firstPartyDomain: null,
-				}
-			browser.cookies.getAll(query, async cookies => {
-				for (const cookie of cookies)
-					if (cookie.name == name) {
-							const setQuery = r.firstPartyIsolate
-								? {
-										url: targetUrl,
-										name: name,
-										value: cookie.value,
-										secure: true,
-										firstPartyDomain: new URL(targetUrl).hostname,
-								  }
-								: {
-										url: targetUrl,
-										name: name,
-										value: cookie.value,
-										secure: true,
-										expirationDate: cookie.expirationDate,
-								  }
-						console.log(toString(targetUrl))
-									const http = new XMLHttpRequest();
-									http.open("GET", targetUrl + endpoint)
-									http.setRequestHeader("Cookie", name + "=" + cookie.value)
-									http.send(null)
-									const preferences = http.responseText
-							//console.log(preferences)
-
-
-							browser.cookies.set(setQuery, () => browser.storage.local.set({ [`${frontend}_${name}`]: preferences }, () => resolve()))
-						break
-					}
-				resolve()
-			})
+			const http = new XMLHttpRequest();
+			const url = `${targetUrl}${endpoint}`
+			http.open("GET", url, false)
+			http.setRequestHeader("Cookie", `${name}=${cookie.value}`)
+			http.send(null)
+			const preferences = JSON.parse(http.responseText)
+			let formdata = new FormData();
+			for (var key in preferences) formdata.append(key, preferences[key]);
+			for (const url of urls) {
+				const http = new XMLHttpRequest();
+				http.open("POST", `${url}/settings/stay`, false)
+				http.send(null)
+			}
+			resolve()
+			return
 		})
 	})
 }
 
 
-function setPreferencesFromToken(frontend, urls, name) {
-	let key = `${frontend}_${name}`
-	let formdata = ""
-	browser.storage.local.get(key, r => {
-		//console.log(r[key])
-		const preferences = JSON.parse(r[key])
-		if (preferences === undefined) return
-		for (const prefName of names(preferences)) {
-			if (formdata != "") {
-				formdata += "&"
-			}
-			formdata += prefName + "=" + preferences[prefName]
-		}
-		for (const url of urls) {
-
-			const http = new XMLHttpRequest();
-			http.open("POST", url + "/settings")
-			http.send(formdata)
-
-
-
-
-
-			/*
-			let query = r.firstPartyIsolate
-				? {
-						url: url,
-						name: cookie.name,
-						value: cookie.value,
-						secure: true,
-						expirationDate: null,
-						firstPartyDomain: new URL(url).hostname,
-				  }
-				: {
-						url: url,
-						name: cookie.name,
-						value: cookie.value,
-						secure: true,
-						expirationDate: cookie.expirationDate,
-				  }
-			browser.cookies.set(query)
-			*/
-		}
-	})
-}
-
 function copyRaw(test, copyRawElement) {
 	return new Promise(resolve => {
 		browser.tabs.query({ active: true, currentWindow: true }, async tabs => {
@@ -575,18 +504,18 @@ function switchInstance(test) {
 }
 
 function latency(name, frontend, document, location) {
-	let latencyElement = document.getElementById(`latency-${frontend}`)
-	let latencyLabel = document.getElementById(`latency-${frontend}-label`)
+	let latencyElement = document.getElementById(`latency - ${frontend} `)
+	let latencyLabel = document.getElementById(`latency - ${frontend} -label`)
 	latencyElement.addEventListener("click", async () => {
 		let reloadWindow = () => location.reload()
 		latencyElement.addEventListener("click", reloadWindow)
-		let key = `${name}Redirects`
+		let key = `${name} Redirects`
 		browser.storage.local.get(key, r => {
 			let redirects = r[key]
 			const oldHtml = latencyLabel.innerHTML
 			latencyLabel.innerHTML = "..."
 			testLatency(latencyLabel, redirects[frontend].normal).then(r => {
-				browser.storage.local.set({ [`${frontend}Latency`]: r })
+				browser.storage.local.set({ [`${frontend} Latency`]: r })
 				latencyLabel.innerHTML = oldHtml
 				processDefaultCustomInstances(name, frontend, "normal", document)
 				latencyElement.removeEventListener("click", reloadWindow)
@@ -604,7 +533,6 @@ export default {
 	copyCookie,
 	getCookiesFromStorage,
 	getPreferencesFromToken,
-	setPreferencesFromToken,
 	switchInstance,
 	copyRaw,
 	unify,
diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 54b7fe0b..221058ee 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -6,14 +6,12 @@
     "https://piped.moomoo.me",
     "https://piped.syncpundit.com",
     "https://piped.mha.fi",
-    "https://piped.shimul.me",
+    "https://jp-piped.shimul.me",
     "https://pipedus.palash.dev",
     "https://piped.waffle.wiki",
     "https://watch.whatever.social",
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
-    "https://nitter.moomoo.me",
-    "https://nitter.it",
     "https://notabird.site",
     "https://fuckthesacklers.network",
     "https://nitter.winscloud.net",
@@ -26,7 +24,6 @@
     "https://bib.actionsack.com",
     "https://libreddit.domain.glass",
     "https://r.nf",
-    "https://libreddit.flux.industries",
     "https://lr.oversold.host",
     "https://libreddit.hu",
     "https://lr.stilic.ml",
@@ -44,6 +41,8 @@
     "https://teddit.garudalinux.org",
     "https://tedd.it",
     "https://wiki.604kph.xyz",
+    "https://lingva.garudalinux.org",
+    "https://translate.dr460nf1r3.org",
     "https://searx.org",
     "https://searx.run",
     "https://search.albony.xyz",
@@ -51,9 +50,35 @@
     "https://search.dr460nf1r3.org",
     "https://search.wef.lol",
     "https://i.actionsack.com",
-    "https://rimgo.encrypted-data.xyz"
+    "https://rimgo.encrypted-data.xyz",
+    "https://beatbump.ml"
   ],
   "authenticate": [
-    "https://nitter.nixnet.services"
+    "https://nitter:nitter@nitter.nixnet.services"
+  ],
+  "offline": [
+    "https://invidious.snopyta.org",
+    "https://tok.habedieeh.re",
+    "https://n.hyperborea.cloud",
+    "https://nitter.spaceint.fr",
+    "https://bibliogram.snopyta.org",
+    "https://libreddit.autarkic.org",
+    "https://libreddit.notyourcomputer.net",
+    "https://anon.sx",
+    "https://jsearch.pw",
+    "https://searx.gnu.style",
+    "https://searx.semipvt.com",
+    "https://searx.vanwa.tech",
+    "https://etsi.me",
+    "https://s.zhaocloud.net",
+    "https://search.vidhukant.xyz",
+    "https://searx.ericaftereric.top",
+    "https://searx.fmac.xyz",
+    "https://searxng.au/searx",
+    "https://www.webrats.xyz",
+    "https://search.albony.xyz",
+    "https://whoogle.esmailelbob.xyz",
+    "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 b74d0622..c5334a47 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -3,7 +3,6 @@
     "normal": [
       "https://yewtu.be",
       "https://vid.puffyan.us",
-      "https://invidious.snopyta.org",
       "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
       "https://invidious.osi.kr",
@@ -13,13 +12,14 @@
       "https://invidious.sethforprivacy.com",
       "https://invidious.tiekoetter.com",
       "https://inv.bp.projectsegfau.lt",
-      "https://invidious.projectsegfau.lt",
       "https://inv.vern.cc",
       "https://invidious.nerdvpn.de",
       "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
-      "https://invidious.weblibre.org",
       "https://youtube.076.ne.jp",
+      "https://invidious.weblibre.org",
+      "https://invidious.snopyta.org",
+      "https://invidious.projectsegfau.lt",
       "https://invidious.esmailelbob.xyz",
       "https://invidious.namazso.eu"
     ],
@@ -45,19 +45,15 @@
       "https://il.ax",
       "https://piped.syncpundit.com",
       "https://piped.mha.fi",
-      "https://piped.shimul.me",
+      "https://jp-piped.shimul.me",
       "https://pipedus.palash.dev",
       "https://piped.waffle.wiki",
       "https://watch.whatever.social",
       "https://yt.jae.fi",
-      "https://piped.mint.lgbt",
-      "https://piped.privacy.com.de",
       "https://piped.esmailelbob.xyz",
       "https://piped.projectsegfau.lt"
     ],
-    "tor": [
-      "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion"
-    ],
+    "tor": [],
     "i2p": [],
     "loki": []
   },
@@ -72,6 +68,17 @@
     "i2p": [],
     "loki": []
   },
+  "cloudtube": {
+    "normal": [
+      "https://tube.cadence.moe",
+      "https://yt.beparanoid.de"
+    ],
+    "tor": [
+      "http://yt.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion"
+    ],
+    "i2p": [],
+    "loki": []
+  },
   "proxiTok": {
     "normal": [
       "https://proxitok.herokuapp.com",
@@ -112,7 +119,7 @@
       "https://nitter.net",
       "https://nitter.42l.fr",
       "https://nitter.pussthecat.org",
-      "https://nitter.nixnet.services",
+      "https://nitter:nitter@nitter.nixnet.services",
       "https://nitter.fdn.fr",
       "https://nitter.1d4.us",
       "https://nitter.kavin.rocks",
@@ -180,12 +187,8 @@
       "https://nitter.slipfox.xyz"
     ],
     "tor": [
-      "http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion",
-      "http://nitter.l4qlywnpwqsluw65ts7md3khrivpirse744un3x7mlskqauz5pyuzgqd.onion",
       "http://nitter7bryz3jv7e3uekphigvmoyoem4al3fynerxkj22dmoxoq553qd.onion",
       "http://npf37k3mtzwxreiw52ccs5ay4e6qt2fkcs2ndieurdyn2cuzzsfyfvid.onion",
-      "http://nitter.v6vgyqpa7yefkorazmg5d5fimstmvm2vtbirt6676mt7qmllrcnwycqd.onion",
-      "http://i23nv6w3juvzlw32xzoxcqzktegd4i4fu3nmnc2ewv4ggiu4ledwklad.onion",
       "http://26oq3gioiwcmfojub37nz5gzbkdiqp7fue5kvye7d4txv4ny6fb4wwid.onion",
       "http://vfaomgh4jxphpbdfizkm5gbtjahmei234giqj4facbwhrfjtcldauqad.onion",
       "http://iwgu3cv7ywf3gssed5iqtavmrlszgsxazkmwwnt4h2kdait75thdyrqd.onion",
@@ -206,8 +209,14 @@
       "http://aaaaaxx74hbzeibageieowryhsqvimbdiitfkfe47tvgawkwkjh3coqd.onion",
       "http://wiio4sgs4247brk7hj6qck2jxnvldwfdbguigc5ivpxrsegnliyfvuqd.onion"
     ],
-    "i2p": [],
-    "loki": []
+    "i2p": [
+      "http://axd6uavsstsrvstva4mzlzh4ct76rc6zdug3nxdgeitrzczhzf4q.b32.i2p",
+      "http://u6ikd6zndl3c4dsdq4mmujpntgeevdk5qzkfb57r4tnfeccrn2qa.b32.i2p",
+      "http://gseczlzmiv23p5vhsktyd7whquq2uy3c5fgkmdohh453qp3daoua.b32.i2p"
+    ],
+    "loki": [
+      "http://nitter.priv.loki"
+    ]
   },
   "bibliogram": {
     "normal": [
@@ -370,6 +379,7 @@
       "http://c2pesewpalbi6lbfc5hf53q4g3ovnxe4s7tfa6k2aqkf7jd7a7dlz5ad.onion"
     ],
     "i2p": [
+      "http://wikiless.i2p",
       "http://hflqp2ejxygpj6cdwo3ogfieqmxw3b56w7dblt7bor2ltwk6kcfa.b32.i2p",
       "http://x33lx4h6d7h6xs4eiqwhvaxn3ea5gn2ifmu3jobnvuvn4k4aej7a.b32.i2p"
     ],
@@ -381,7 +391,8 @@
       "https://scribe.nixnet.services",
       "https://scribe.citizen4.eu",
       "https://scribe.bus-hit.me",
-      "https://scribe.froth.zone"
+      "https://scribe.froth.zone",
+      "https://scribe.esmailelbob.xyz"
     ],
     "tor": [],
     "i2p": [],
@@ -452,7 +463,10 @@
       "https://lingva.pussthecat.org",
       "https://translate.plausibility.cloud",
       "https://lingva.lunar.icu",
-      "https://lingva.opnxng.com"
+      "https://lingva.opnxng.com",
+      "https://translate.projectsegfau.lt",
+      "https://lingva.garudalinux.org",
+      "https://translate.dr460nf1r3.org"
     ],
     "tor": [],
     "i2p": [],
@@ -478,8 +492,6 @@
       "https://searx.netzspielplatz.de",
       "https://searx.nixnet.services",
       "https://searx.org",
-      "https://searx.priv.pw",
-      "https://searx.pwoss.org",
       "https://searx.rasp.fr",
       "https://searx.ru",
       "https://searx.run",
@@ -489,6 +501,7 @@
       "https://searx.tuxcloud.net",
       "https://searx.tyil.nl",
       "https://searx.vanwa.tech",
+      "https://searx.vimproved.me",
       "https://searx.webheberg.info",
       "https://searx.xyz",
       "https://searx.zapashcanon.fr",
@@ -506,7 +519,8 @@
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
-      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
+      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -519,7 +533,6 @@
       "https://darmarit.org/searx",
       "https://de.xcxc.ml",
       "https://etsi.me",
-      "https://icanfindit.online",
       "https://jackgoss.xyz",
       "https://northboot.xyz",
       "https://opnxng.com",
@@ -529,6 +542,7 @@
       "https://s.frlt.one",
       "https://s.zhaocloud.net",
       "https://saber.tk",
+      "https://search.0relay.com",
       "https://search.affusio.com",
       "https://search.ashs.club",
       "https://search.bingowaves.xyz",
@@ -561,33 +575,34 @@
       "https://searx.mistli.net",
       "https://searx.namejeff.xyz",
       "https://searx.orion-hub.fr",
+      "https://searx.priv.pw",
       "https://searx.prvcy.eu",
       "https://searx.rimkus.it",
       "https://searx.sethforprivacy.com",
       "https://searx.sev.monster",
       "https://searx.slipfox.xyz/searx",
       "https://searx.tiekoetter.com",
-      "https://searx.vimproved.me",
-      "https://searx.youshitsune.me",
       "https://searx.zcyph.cc",
       "https://searxng.au/searx",
       "https://searxng.tordenskjold.de",
       "https://searxng.zackptg5.com",
       "https://serx.ml",
+      "https://sh0.it",
       "https://srx.cosmohub.io",
       "https://swag.pw",
       "https://www.gruble.de",
       "https://www.webrats.xyz",
-      "https://xcxc.ml"
+      "https://xcxc.ml",
+      "https://xo.wtf"
     ],
     "tor": [
       "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
+      "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
       "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
-      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
       "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
@@ -637,6 +652,7 @@
     "normal": [
       "https://i.bcow.xyz",
       "https://rimgo.pussthecat.org",
+      "https://rimgo.totaldarkness.net",
       "https://rimgo.bus-hit.me",
       "https://rimgo.esmailelbob.xyz",
       "https://rimgo.lunar.icu",
@@ -662,16 +678,65 @@
       "https://librarian.pussthecat.org",
       "https://lbry.mutahar.rocks",
       "https://librarian.esmailelbob.xyz",
-      "https://lbry.vern.cc"
+      "https://lbry.vern.cc",
+      "https://lbry.slipfox.xyz"
     ],
     "tor": [
       "http://librarian.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
-      "http://lbry.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
+      "http://lbry.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
+      "http://5znbzx2xcymhddzekfjib3isgqq4ilcyxa2bsq6vqmnvbtgu4f776lqd.onion"
+    ],
+    "i2p": [],
+    "loki": []
+  },
+  "neuters": {
+    "normal": [
+      "https://neuters.de"
+    ],
+    "tor": [],
+    "i2p": [],
+    "loki": []
+  },
+  "beatbump": {
+    "normal": [
+      "https://beatbump.ml"
+    ],
+    "tor": [],
+    "i2p": [],
+    "loki": []
+  },
+  "hyperpipe": {
+    "normal": [
+      "https://hyperpipe.surge.sh",
+      "https://hyperpipe.esmailelbob.xyz"
+    ],
+    "tor": [],
+    "i2p": [],
+    "loki": []
+  },
+  "facil": {
+    "normal": [
+      "https://facilmap.org"
     ],
+    "tor": [],
+    "i2p": [],
+    "loki": []
+  },
+  "simpleertube": {
+    "normal": [
+      "https://tube.simple-web.org",
+      "https://simpleertube.esmailelbob.xyz",
+      "https://stube.tokhmi.xyz"
+    ],
+    "tor": [],
     "i2p": [],
     "loki": []
   },
   "peertube": [
+    "https://tube.nogafa.org",
+    "https://www.neptube.io",
+    "https://tube.ghk-academy.info",
+    "https://pcbu.nl",
     "https://soberania.tv",
     "https://pire.artisanlogiciel.net",
     "https://trutube.xyz",
@@ -728,7 +793,6 @@
     "https://video.occm.cc",
     "https://peertube.viviers-fibre.net",
     "https://tube-action-educative.apps.education.fr",
-    "https://themadlads.live",
     "https://jahve.pl",
     "https://videos.yesil.club",
     "https://peertube.adjutor.xyz",
@@ -787,7 +851,6 @@
     "https://videos.neongarden.life",
     "https://video.vaku.org.ua",
     "https://videos.trom.lt",
-    "https://videod.fr",
     "https://vid.mkp.ca",
     "https://jupiter.tube",
     "https://tuvideo.encanarias.info",
@@ -795,7 +858,6 @@
     "https://peertube.chaunchy.com",
     "https://tube.vrpnet.org",
     "https://video.tii.space",
-    "https://peertube.familleboisteau.fr",
     "https://peertube.inubo.ch",
     "https://nightshift.minnix.dev",
     "https://tube.friloux.me",
@@ -826,7 +888,6 @@
     "https://video.niboe.info",
     "https://peertuibe.fedsinfo.nohost.me",
     "https://s9.gegenstimme.tv",
-    "https://pocketnetpeertube1.nohost.me",
     "https://videos.alamaisondulibre.org",
     "https://videos.tormentasolar.win",
     "https://tube.nestor.coop",
@@ -850,7 +911,6 @@
     "https://tube.rooty.fr",
     "https://tube.dnet.one",
     "https://peertube.io",
-    "https://peertube.echelon4.space",
     "https://www.kotikoff.net",
     "https://peertube.nz",
     "https://videos.grafo.zone",
@@ -864,7 +924,6 @@
     "https://krdtube.org",
     "https://peertube.elforcer.ru",
     "https://tubocatodico.bida.im",
-    "https://linhtran.eu",
     "https://torstenwitte.peertube-host.de",
     "https://peertube.hackerfraternity.org",
     "https://openmedia.edunova.it",
@@ -931,7 +990,6 @@
     "https://videos.slownewsdayshow.com",
     "https://videos.sarcasmstardust.com",
     "https://videos.factsonthegroundshow.com",
-    "https://video.regenpfeifer.net",
     "https://video.pe6.eu",
     "https://tv.santic-zombie.ru",
     "https://tube.sleeping.town",
@@ -943,7 +1001,6 @@
     "https://videos.ritimo.org",
     "https://videos.ephphatha.church",
     "https://video.cerclearistote.com",
-    "https://computerstuff.mooo.com",
     "https://video.greenmycity.eu",
     "https://przej.me",
     "https://pt.mezzo.moe",
@@ -963,7 +1020,6 @@
     "https://videos.yeswiki.net",
     "https://tube.lrk.sh",
     "https://peertube.autogestioncitoyenne.org",
-    "https://stream.dynacloud.ynh.fr",
     "https://video.r3s.nrw",
     "https://peertube.semweb.pro",
     "https://poast.tv",
@@ -1026,7 +1082,6 @@
     "https://peertube.home.x0r.fr",
     "https://peertube.marud.fr",
     "https://freetubehub.live",
-    "https://peertube.librelabucm.org",
     "https://mtube.mooo.com",
     "https://skeptube.fr",
     "https://tube.villejuif.fr",
@@ -1044,7 +1099,6 @@
     "https://tube.rfc1149.net",
     "https://tube.radiomercure.fr",
     "https://peertube.1984.cz",
-    "https://tube.sp4ke.com",
     "https://pt.nix.uno",
     "https://videos.openmandriva.org",
     "https://video.vanderwarker.photos",
@@ -1183,7 +1237,6 @@
     "https://tube.okcinfo.news",
     "https://www.rocaguinarda.tv",
     "https://videos.wirtube.de",
-    "https://tube.tinfoil-hat.net",
     "https://livegram.net",
     "https://video.ustim.ru",
     "https://merci-la-police.fr",
@@ -1381,9 +1434,7 @@
     "https://video.taboulisme.com",
     "https://media.undeadnetwork.de",
     "https://tube.dragonpsi.xyz",
-    "https://veezee.tube",
     "https://peertube.nicolastissot.fr",
-    "https://s2.veezee.tube",
     "https://tubes.jodh.us",
     "https://tube.lucie-philou.com",
     "https://video.odayacres.farm",
@@ -1517,7 +1568,6 @@
     "https://peertube.davigge.com",
     "https://vod.ksite.de",
     "https://tube.grin.hu",
-    "https://media.inno3.cricket",
     "https://tube.cryptography.dog",
     "https://peertube.zergy.net",
     "https://vid.ncrypt.at",
@@ -1716,6 +1766,14 @@
     "https://video.passageenseine.fr",
     "https://peertube.touhoppai.moe",
     "https://share.tube",
-    "https://peertube.heraut.eu"
+    "https://peertube.heraut.eu",
+    "https://peertube.gegeweb.eu",
+    "https://framatube.org",
+    "https://tube.conferences-gesticulees.net",
+    "https://peertube.datagueule.tv",
+    "https://video.lqdn.fr",
+    "https://peertube3.cpy.re",
+    "https://peertube2.cpy.re",
+    "https://peertube.cpy.re"
   ]
 }
\ No newline at end of file
-- 
cgit 1.4.1


From 8ea4d37b43b71b9ab5f81f1d95a0ad1ff1abc65c Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Tue, 2 Aug 2022 18:09:24 +0300
Subject: rebase

---
 src/assets/javascripts/instagram.js |  23 +-----
 src/assets/javascripts/utils.js     | 158 ++++++++++--------------------------
 src/instances/blacklist.json        |  37 +++++++--
 src/instances/data.json             | 146 +++++++++++++++++++++++----------
 4 files changed, 177 insertions(+), 187 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/assets/javascripts/instagram.js b/src/assets/javascripts/instagram.js
index 1690c84a..00042074 100644
--- a/src/assets/javascripts/instagram.js
+++ b/src/assets/javascripts/instagram.js
@@ -102,32 +102,12 @@ function initBibliogramPreferences(test, from) {
 			if ((checkedInstances.length === 0 && protocolFallback) || protocol == "normal") {
 				checkedInstances = [...bibliogramNormalRedirectsChecks, ...bibliogramNormalCustomRedirects]
 			}
-			utils.getPreferencesFromToken("bibliogram", from, checkedInstances, "settings", "/settings.json")
-			utils.setPreferencesFromToken("bibliogram", checkedInstances, "settings")
+			await utils.getPreferencesFromToken("bibliogram", from, checkedInstances, "settings", "settings.json")
 		}
 		resolve(true)
 	})
 }
 
-function setBibliogramPreferences() {
-	return new Promise(async resolve => {
-		await init()
-		if (disableInstagram || protocol === undefined) {
-			resolve()
-			return
-		}
-		let checkedInstances = []
-		if (protocol == "loki") checkedInstances = [...bibliogramLokiCustomRedirects]
-		else if (protocol == "i2p") checkedInstances = [...bibliogramI2pCustomRedirects]
-		else if (protocol == "tor") checkedInstances = [...bibliogramTorRedirectsChecks, ...bibliogramTorCustomRedirects]
-		if ((checkedInstances.length === 0 && protocolFallback) || protocol == "normal") {
-			checkedInstances = [...bibliogramNormalRedirectsChecks, ...bibliogramNormalCustomRedirects]
-		}
-		utils.setPreferencesFromToken("bibliogram", checkedInstances, "settings")
-		resolve()
-	})
-}
-
 function all() {
 	return [
 		...bibliogramNormalRedirectsChecks,
@@ -254,7 +234,6 @@ function initDefaults() {
 export default {
 	setRedirects,
 	initBibliogramPreferences,
-	setBibliogramPreferences,
 	reverse,
 	redirect,
 	initDefaults,
diff --git a/src/assets/javascripts/utils.js b/src/assets/javascripts/utils.js
index 59beeac7..a6b011a3 100644
--- a/src/assets/javascripts/utils.js
+++ b/src/assets/javascripts/utils.js
@@ -352,19 +352,19 @@ function copyCookie(frontend, targetUrl, urls, name) {
 						for (const url of urls) {
 							const setQuery = r.firstPartyIsolate
 								? {
-										url: url,
-										name: name,
-										value: cookie.value,
-										secure: true,
-										firstPartyDomain: new URL(url).hostname,
-								  }
+									url: url,
+									name: name,
+									value: cookie.value,
+									secure: true,
+									firstPartyDomain: new URL(url).hostname,
+								}
 								: {
-										url: url,
-										name: name,
-										value: cookie.value,
-										secure: true,
-										expirationDate: cookie.expirationDate,
-								  }
+									url: url,
+									name: name,
+									value: cookie.value,
+									secure: true,
+									expirationDate: cookie.expirationDate,
+								}
 							browser.cookies.set(setQuery, () => browser.storage.local.set({ [`${frontend}_${name}`]: cookie }, () => resolve()))
 						}
 						break
@@ -383,20 +383,20 @@ function getCookiesFromStorage(frontend, urls, name) {
 		for (const url of urls) {
 			let query = r.firstPartyIsolate
 				? {
-						url: url,
-						name: cookie.name,
-						value: cookie.value,
-						secure: true,
-						expirationDate: null,
-						firstPartyDomain: new URL(url).hostname,
-				  }
+					url: url,
+					name: cookie.name,
+					value: cookie.value,
+					secure: true,
+					expirationDate: null,
+					firstPartyDomain: new URL(url).hostname,
+				}
 				: {
-						url: url,
-						name: cookie.name,
-						value: cookie.value,
-						secure: true,
-						expirationDate: cookie.expirationDate,
-				  }
+					url: url,
+					name: cookie.name,
+					value: cookie.value,
+					secure: true,
+					expirationDate: cookie.expirationDate,
+				}
 			browser.cookies.set(query)
 		}
 	})
@@ -405,97 +405,26 @@ function getCookiesFromStorage(frontend, urls, name) {
 function getPreferencesFromToken(frontend, targetUrl, urls, name, endpoint) {
 	return new Promise(resolve => {
 		browser.storage.local.get("firstPartyIsolate", r => {
-			let query
-			if (!r.firstPartyIsolate) query = { url: protocolHost(targetUrl), name: name }
-			else
-				query = {
-					url: protocolHost(targetUrl),
-					name: name,
-					firstPartyDomain: null,
-				}
-			browser.cookies.getAll(query, async cookies => {
-				for (const cookie of cookies)
-					if (cookie.name == name) {
-							const setQuery = r.firstPartyIsolate
-								? {
-										url: targetUrl,
-										name: name,
-										value: cookie.value,
-										secure: true,
-										firstPartyDomain: new URL(targetUrl).hostname,
-								  }
-								: {
-										url: targetUrl,
-										name: name,
-										value: cookie.value,
-										secure: true,
-										expirationDate: cookie.expirationDate,
-								  }
-						console.log(toString(targetUrl))
-									const http = new XMLHttpRequest();
-									http.open("GET", targetUrl + endpoint)
-									http.setRequestHeader("Cookie", name + "=" + cookie.value)
-									http.send(null)
-									const preferences = http.responseText
-							//console.log(preferences)
-
-
-							browser.cookies.set(setQuery, () => browser.storage.local.set({ [`${frontend}_${name}`]: preferences }, () => resolve()))
-						break
-					}
-				resolve()
-			})
+			const http = new XMLHttpRequest();
+			const url = `${targetUrl}${endpoint}`
+			http.open("GET", url, false)
+			http.setRequestHeader("Cookie", `${name}=${cookie.value}`)
+			http.send(null)
+			const preferences = JSON.parse(http.responseText)
+			let formdata = new FormData();
+			for (var key in preferences) formdata.append(key, preferences[key]);
+			for (const url of urls) {
+				const http = new XMLHttpRequest();
+				http.open("POST", `${url}/settings/stay`, false)
+				http.send(null)
+			}
+			resolve()
+			return
 		})
 	})
 }
 
 
-function setPreferencesFromToken(frontend, urls, name) {
-	let key = `${frontend}_${name}`
-	let formdata = ""
-	browser.storage.local.get(key, r => {
-		//console.log(r[key])
-		const preferences = JSON.parse(r[key])
-		if (preferences === undefined) return
-		for (const prefName of names(preferences)) {
-			if (formdata != "") {
-				formdata += "&"
-			}
-			formdata += prefName + "=" + preferences[prefName]
-		}
-		for (const url of urls) {
-
-			const http = new XMLHttpRequest();
-			http.open("POST", url + "/settings")
-			http.send(formdata)
-
-
-
-
-
-			/*
-			let query = r.firstPartyIsolate
-				? {
-						url: url,
-						name: cookie.name,
-						value: cookie.value,
-						secure: true,
-						expirationDate: null,
-						firstPartyDomain: new URL(url).hostname,
-				  }
-				: {
-						url: url,
-						name: cookie.name,
-						value: cookie.value,
-						secure: true,
-						expirationDate: cookie.expirationDate,
-				  }
-			browser.cookies.set(query)
-			*/
-		}
-	})
-}
-
 function copyRaw(test, copyRawElement) {
 	return new Promise(resolve => {
 		browser.tabs.query({ active: true, currentWindow: true }, async tabs => {
@@ -612,12 +541,12 @@ function switchInstance(test) {
 }
 
 function latency(name, frontend, document, location) {
-	let latencyElement = document.getElementById(`latency-${frontend}`)
-	let latencyLabel = document.getElementById(`latency-${frontend}-label`)
+	let latencyElement = document.getElementById(`latency - ${frontend} `)
+	let latencyLabel = document.getElementById(`latency - ${frontend} -label`)
 	latencyElement.addEventListener("click", async () => {
 		let reloadWindow = () => location.reload()
 		latencyElement.addEventListener("click", reloadWindow)
-		let key = `${name}Redirects`
+		let key = `${name} Redirects`
 		browser.storage.local.get(key, r => {
 			let redirects = r[key]
 			const oldHtml = latencyLabel.innerHTML
@@ -641,7 +570,6 @@ export default {
 	copyCookie,
 	getCookiesFromStorage,
 	getPreferencesFromToken,
-	setPreferencesFromToken,
 	switchInstance,
 	copyRaw,
 	unify,
diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 54b7fe0b..221058ee 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -6,14 +6,12 @@
     "https://piped.moomoo.me",
     "https://piped.syncpundit.com",
     "https://piped.mha.fi",
-    "https://piped.shimul.me",
+    "https://jp-piped.shimul.me",
     "https://pipedus.palash.dev",
     "https://piped.waffle.wiki",
     "https://watch.whatever.social",
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
-    "https://nitter.moomoo.me",
-    "https://nitter.it",
     "https://notabird.site",
     "https://fuckthesacklers.network",
     "https://nitter.winscloud.net",
@@ -26,7 +24,6 @@
     "https://bib.actionsack.com",
     "https://libreddit.domain.glass",
     "https://r.nf",
-    "https://libreddit.flux.industries",
     "https://lr.oversold.host",
     "https://libreddit.hu",
     "https://lr.stilic.ml",
@@ -44,6 +41,8 @@
     "https://teddit.garudalinux.org",
     "https://tedd.it",
     "https://wiki.604kph.xyz",
+    "https://lingva.garudalinux.org",
+    "https://translate.dr460nf1r3.org",
     "https://searx.org",
     "https://searx.run",
     "https://search.albony.xyz",
@@ -51,9 +50,35 @@
     "https://search.dr460nf1r3.org",
     "https://search.wef.lol",
     "https://i.actionsack.com",
-    "https://rimgo.encrypted-data.xyz"
+    "https://rimgo.encrypted-data.xyz",
+    "https://beatbump.ml"
   ],
   "authenticate": [
-    "https://nitter.nixnet.services"
+    "https://nitter:nitter@nitter.nixnet.services"
+  ],
+  "offline": [
+    "https://invidious.snopyta.org",
+    "https://tok.habedieeh.re",
+    "https://n.hyperborea.cloud",
+    "https://nitter.spaceint.fr",
+    "https://bibliogram.snopyta.org",
+    "https://libreddit.autarkic.org",
+    "https://libreddit.notyourcomputer.net",
+    "https://anon.sx",
+    "https://jsearch.pw",
+    "https://searx.gnu.style",
+    "https://searx.semipvt.com",
+    "https://searx.vanwa.tech",
+    "https://etsi.me",
+    "https://s.zhaocloud.net",
+    "https://search.vidhukant.xyz",
+    "https://searx.ericaftereric.top",
+    "https://searx.fmac.xyz",
+    "https://searxng.au/searx",
+    "https://www.webrats.xyz",
+    "https://search.albony.xyz",
+    "https://whoogle.esmailelbob.xyz",
+    "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 b74d0622..c5334a47 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -3,7 +3,6 @@
     "normal": [
       "https://yewtu.be",
       "https://vid.puffyan.us",
-      "https://invidious.snopyta.org",
       "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
       "https://invidious.osi.kr",
@@ -13,13 +12,14 @@
       "https://invidious.sethforprivacy.com",
       "https://invidious.tiekoetter.com",
       "https://inv.bp.projectsegfau.lt",
-      "https://invidious.projectsegfau.lt",
       "https://inv.vern.cc",
       "https://invidious.nerdvpn.de",
       "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
-      "https://invidious.weblibre.org",
       "https://youtube.076.ne.jp",
+      "https://invidious.weblibre.org",
+      "https://invidious.snopyta.org",
+      "https://invidious.projectsegfau.lt",
       "https://invidious.esmailelbob.xyz",
       "https://invidious.namazso.eu"
     ],
@@ -45,19 +45,15 @@
       "https://il.ax",
       "https://piped.syncpundit.com",
       "https://piped.mha.fi",
-      "https://piped.shimul.me",
+      "https://jp-piped.shimul.me",
       "https://pipedus.palash.dev",
       "https://piped.waffle.wiki",
       "https://watch.whatever.social",
       "https://yt.jae.fi",
-      "https://piped.mint.lgbt",
-      "https://piped.privacy.com.de",
       "https://piped.esmailelbob.xyz",
       "https://piped.projectsegfau.lt"
     ],
-    "tor": [
-      "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion"
-    ],
+    "tor": [],
     "i2p": [],
     "loki": []
   },
@@ -72,6 +68,17 @@
     "i2p": [],
     "loki": []
   },
+  "cloudtube": {
+    "normal": [
+      "https://tube.cadence.moe",
+      "https://yt.beparanoid.de"
+    ],
+    "tor": [
+      "http://yt.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion"
+    ],
+    "i2p": [],
+    "loki": []
+  },
   "proxiTok": {
     "normal": [
       "https://proxitok.herokuapp.com",
@@ -112,7 +119,7 @@
       "https://nitter.net",
       "https://nitter.42l.fr",
       "https://nitter.pussthecat.org",
-      "https://nitter.nixnet.services",
+      "https://nitter:nitter@nitter.nixnet.services",
       "https://nitter.fdn.fr",
       "https://nitter.1d4.us",
       "https://nitter.kavin.rocks",
@@ -180,12 +187,8 @@
       "https://nitter.slipfox.xyz"
     ],
     "tor": [
-      "http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion",
-      "http://nitter.l4qlywnpwqsluw65ts7md3khrivpirse744un3x7mlskqauz5pyuzgqd.onion",
       "http://nitter7bryz3jv7e3uekphigvmoyoem4al3fynerxkj22dmoxoq553qd.onion",
       "http://npf37k3mtzwxreiw52ccs5ay4e6qt2fkcs2ndieurdyn2cuzzsfyfvid.onion",
-      "http://nitter.v6vgyqpa7yefkorazmg5d5fimstmvm2vtbirt6676mt7qmllrcnwycqd.onion",
-      "http://i23nv6w3juvzlw32xzoxcqzktegd4i4fu3nmnc2ewv4ggiu4ledwklad.onion",
       "http://26oq3gioiwcmfojub37nz5gzbkdiqp7fue5kvye7d4txv4ny6fb4wwid.onion",
       "http://vfaomgh4jxphpbdfizkm5gbtjahmei234giqj4facbwhrfjtcldauqad.onion",
       "http://iwgu3cv7ywf3gssed5iqtavmrlszgsxazkmwwnt4h2kdait75thdyrqd.onion",
@@ -206,8 +209,14 @@
       "http://aaaaaxx74hbzeibageieowryhsqvimbdiitfkfe47tvgawkwkjh3coqd.onion",
       "http://wiio4sgs4247brk7hj6qck2jxnvldwfdbguigc5ivpxrsegnliyfvuqd.onion"
     ],
-    "i2p": [],
-    "loki": []
+    "i2p": [
+      "http://axd6uavsstsrvstva4mzlzh4ct76rc6zdug3nxdgeitrzczhzf4q.b32.i2p",
+      "http://u6ikd6zndl3c4dsdq4mmujpntgeevdk5qzkfb57r4tnfeccrn2qa.b32.i2p",
+      "http://gseczlzmiv23p5vhsktyd7whquq2uy3c5fgkmdohh453qp3daoua.b32.i2p"
+    ],
+    "loki": [
+      "http://nitter.priv.loki"
+    ]
   },
   "bibliogram": {
     "normal": [
@@ -370,6 +379,7 @@
       "http://c2pesewpalbi6lbfc5hf53q4g3ovnxe4s7tfa6k2aqkf7jd7a7dlz5ad.onion"
     ],
     "i2p": [
+      "http://wikiless.i2p",
       "http://hflqp2ejxygpj6cdwo3ogfieqmxw3b56w7dblt7bor2ltwk6kcfa.b32.i2p",
       "http://x33lx4h6d7h6xs4eiqwhvaxn3ea5gn2ifmu3jobnvuvn4k4aej7a.b32.i2p"
     ],
@@ -381,7 +391,8 @@
       "https://scribe.nixnet.services",
       "https://scribe.citizen4.eu",
       "https://scribe.bus-hit.me",
-      "https://scribe.froth.zone"
+      "https://scribe.froth.zone",
+      "https://scribe.esmailelbob.xyz"
     ],
     "tor": [],
     "i2p": [],
@@ -452,7 +463,10 @@
       "https://lingva.pussthecat.org",
       "https://translate.plausibility.cloud",
       "https://lingva.lunar.icu",
-      "https://lingva.opnxng.com"
+      "https://lingva.opnxng.com",
+      "https://translate.projectsegfau.lt",
+      "https://lingva.garudalinux.org",
+      "https://translate.dr460nf1r3.org"
     ],
     "tor": [],
     "i2p": [],
@@ -478,8 +492,6 @@
       "https://searx.netzspielplatz.de",
       "https://searx.nixnet.services",
       "https://searx.org",
-      "https://searx.priv.pw",
-      "https://searx.pwoss.org",
       "https://searx.rasp.fr",
       "https://searx.ru",
       "https://searx.run",
@@ -489,6 +501,7 @@
       "https://searx.tuxcloud.net",
       "https://searx.tyil.nl",
       "https://searx.vanwa.tech",
+      "https://searx.vimproved.me",
       "https://searx.webheberg.info",
       "https://searx.xyz",
       "https://searx.zapashcanon.fr",
@@ -506,7 +519,8 @@
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
-      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
+      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -519,7 +533,6 @@
       "https://darmarit.org/searx",
       "https://de.xcxc.ml",
       "https://etsi.me",
-      "https://icanfindit.online",
       "https://jackgoss.xyz",
       "https://northboot.xyz",
       "https://opnxng.com",
@@ -529,6 +542,7 @@
       "https://s.frlt.one",
       "https://s.zhaocloud.net",
       "https://saber.tk",
+      "https://search.0relay.com",
       "https://search.affusio.com",
       "https://search.ashs.club",
       "https://search.bingowaves.xyz",
@@ -561,33 +575,34 @@
       "https://searx.mistli.net",
       "https://searx.namejeff.xyz",
       "https://searx.orion-hub.fr",
+      "https://searx.priv.pw",
       "https://searx.prvcy.eu",
       "https://searx.rimkus.it",
       "https://searx.sethforprivacy.com",
       "https://searx.sev.monster",
       "https://searx.slipfox.xyz/searx",
       "https://searx.tiekoetter.com",
-      "https://searx.vimproved.me",
-      "https://searx.youshitsune.me",
       "https://searx.zcyph.cc",
       "https://searxng.au/searx",
       "https://searxng.tordenskjold.de",
       "https://searxng.zackptg5.com",
       "https://serx.ml",
+      "https://sh0.it",
       "https://srx.cosmohub.io",
       "https://swag.pw",
       "https://www.gruble.de",
       "https://www.webrats.xyz",
-      "https://xcxc.ml"
+      "https://xcxc.ml",
+      "https://xo.wtf"
     ],
     "tor": [
       "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
+      "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
       "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
-      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
       "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
@@ -637,6 +652,7 @@
     "normal": [
       "https://i.bcow.xyz",
       "https://rimgo.pussthecat.org",
+      "https://rimgo.totaldarkness.net",
       "https://rimgo.bus-hit.me",
       "https://rimgo.esmailelbob.xyz",
       "https://rimgo.lunar.icu",
@@ -662,16 +678,65 @@
       "https://librarian.pussthecat.org",
       "https://lbry.mutahar.rocks",
       "https://librarian.esmailelbob.xyz",
-      "https://lbry.vern.cc"
+      "https://lbry.vern.cc",
+      "https://lbry.slipfox.xyz"
     ],
     "tor": [
       "http://librarian.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
-      "http://lbry.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
+      "http://lbry.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
+      "http://5znbzx2xcymhddzekfjib3isgqq4ilcyxa2bsq6vqmnvbtgu4f776lqd.onion"
+    ],
+    "i2p": [],
+    "loki": []
+  },
+  "neuters": {
+    "normal": [
+      "https://neuters.de"
+    ],
+    "tor": [],
+    "i2p": [],
+    "loki": []
+  },
+  "beatbump": {
+    "normal": [
+      "https://beatbump.ml"
+    ],
+    "tor": [],
+    "i2p": [],
+    "loki": []
+  },
+  "hyperpipe": {
+    "normal": [
+      "https://hyperpipe.surge.sh",
+      "https://hyperpipe.esmailelbob.xyz"
+    ],
+    "tor": [],
+    "i2p": [],
+    "loki": []
+  },
+  "facil": {
+    "normal": [
+      "https://facilmap.org"
     ],
+    "tor": [],
+    "i2p": [],
+    "loki": []
+  },
+  "simpleertube": {
+    "normal": [
+      "https://tube.simple-web.org",
+      "https://simpleertube.esmailelbob.xyz",
+      "https://stube.tokhmi.xyz"
+    ],
+    "tor": [],
     "i2p": [],
     "loki": []
   },
   "peertube": [
+    "https://tube.nogafa.org",
+    "https://www.neptube.io",
+    "https://tube.ghk-academy.info",
+    "https://pcbu.nl",
     "https://soberania.tv",
     "https://pire.artisanlogiciel.net",
     "https://trutube.xyz",
@@ -728,7 +793,6 @@
     "https://video.occm.cc",
     "https://peertube.viviers-fibre.net",
     "https://tube-action-educative.apps.education.fr",
-    "https://themadlads.live",
     "https://jahve.pl",
     "https://videos.yesil.club",
     "https://peertube.adjutor.xyz",
@@ -787,7 +851,6 @@
     "https://videos.neongarden.life",
     "https://video.vaku.org.ua",
     "https://videos.trom.lt",
-    "https://videod.fr",
     "https://vid.mkp.ca",
     "https://jupiter.tube",
     "https://tuvideo.encanarias.info",
@@ -795,7 +858,6 @@
     "https://peertube.chaunchy.com",
     "https://tube.vrpnet.org",
     "https://video.tii.space",
-    "https://peertube.familleboisteau.fr",
     "https://peertube.inubo.ch",
     "https://nightshift.minnix.dev",
     "https://tube.friloux.me",
@@ -826,7 +888,6 @@
     "https://video.niboe.info",
     "https://peertuibe.fedsinfo.nohost.me",
     "https://s9.gegenstimme.tv",
-    "https://pocketnetpeertube1.nohost.me",
     "https://videos.alamaisondulibre.org",
     "https://videos.tormentasolar.win",
     "https://tube.nestor.coop",
@@ -850,7 +911,6 @@
     "https://tube.rooty.fr",
     "https://tube.dnet.one",
     "https://peertube.io",
-    "https://peertube.echelon4.space",
     "https://www.kotikoff.net",
     "https://peertube.nz",
     "https://videos.grafo.zone",
@@ -864,7 +924,6 @@
     "https://krdtube.org",
     "https://peertube.elforcer.ru",
     "https://tubocatodico.bida.im",
-    "https://linhtran.eu",
     "https://torstenwitte.peertube-host.de",
     "https://peertube.hackerfraternity.org",
     "https://openmedia.edunova.it",
@@ -931,7 +990,6 @@
     "https://videos.slownewsdayshow.com",
     "https://videos.sarcasmstardust.com",
     "https://videos.factsonthegroundshow.com",
-    "https://video.regenpfeifer.net",
     "https://video.pe6.eu",
     "https://tv.santic-zombie.ru",
     "https://tube.sleeping.town",
@@ -943,7 +1001,6 @@
     "https://videos.ritimo.org",
     "https://videos.ephphatha.church",
     "https://video.cerclearistote.com",
-    "https://computerstuff.mooo.com",
     "https://video.greenmycity.eu",
     "https://przej.me",
     "https://pt.mezzo.moe",
@@ -963,7 +1020,6 @@
     "https://videos.yeswiki.net",
     "https://tube.lrk.sh",
     "https://peertube.autogestioncitoyenne.org",
-    "https://stream.dynacloud.ynh.fr",
     "https://video.r3s.nrw",
     "https://peertube.semweb.pro",
     "https://poast.tv",
@@ -1026,7 +1082,6 @@
     "https://peertube.home.x0r.fr",
     "https://peertube.marud.fr",
     "https://freetubehub.live",
-    "https://peertube.librelabucm.org",
     "https://mtube.mooo.com",
     "https://skeptube.fr",
     "https://tube.villejuif.fr",
@@ -1044,7 +1099,6 @@
     "https://tube.rfc1149.net",
     "https://tube.radiomercure.fr",
     "https://peertube.1984.cz",
-    "https://tube.sp4ke.com",
     "https://pt.nix.uno",
     "https://videos.openmandriva.org",
     "https://video.vanderwarker.photos",
@@ -1183,7 +1237,6 @@
     "https://tube.okcinfo.news",
     "https://www.rocaguinarda.tv",
     "https://videos.wirtube.de",
-    "https://tube.tinfoil-hat.net",
     "https://livegram.net",
     "https://video.ustim.ru",
     "https://merci-la-police.fr",
@@ -1381,9 +1434,7 @@
     "https://video.taboulisme.com",
     "https://media.undeadnetwork.de",
     "https://tube.dragonpsi.xyz",
-    "https://veezee.tube",
     "https://peertube.nicolastissot.fr",
-    "https://s2.veezee.tube",
     "https://tubes.jodh.us",
     "https://tube.lucie-philou.com",
     "https://video.odayacres.farm",
@@ -1517,7 +1568,6 @@
     "https://peertube.davigge.com",
     "https://vod.ksite.de",
     "https://tube.grin.hu",
-    "https://media.inno3.cricket",
     "https://tube.cryptography.dog",
     "https://peertube.zergy.net",
     "https://vid.ncrypt.at",
@@ -1716,6 +1766,14 @@
     "https://video.passageenseine.fr",
     "https://peertube.touhoppai.moe",
     "https://share.tube",
-    "https://peertube.heraut.eu"
+    "https://peertube.heraut.eu",
+    "https://peertube.gegeweb.eu",
+    "https://framatube.org",
+    "https://tube.conferences-gesticulees.net",
+    "https://peertube.datagueule.tv",
+    "https://video.lqdn.fr",
+    "https://peertube3.cpy.re",
+    "https://peertube2.cpy.re",
+    "https://peertube.cpy.re"
   ]
 }
\ No newline at end of file
-- 
cgit 1.4.1


From fe0a2782e47c55149e2c46fb79d1150dc191c8e6 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Thu, 28 Jul 2022 22:35:02 +0000
Subject: update instances

---
 src/assets/javascripts/translate/translate.js |  2 +-
 src/instances/blacklist.json                  |  4 ++--
 src/instances/data.json                       | 12 +++++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/assets/javascripts/translate/translate.js b/src/assets/javascripts/translate/translate.js
index 893be4e2..2c500759 100644
--- a/src/assets/javascripts/translate/translate.js
+++ b/src/assets/javascripts/translate/translate.js
@@ -271,7 +271,7 @@ function switchInstance(url, disableOverride) {
 			return
 		}
 
-		let instancesList
+		let instancesList = []
 
 		if (protocol == "loki") {
 			if (translateFrontend == "simplyTranslate") instancesList = [...simplyTranslateLokiRedirectsChecks, ...simplyTranslateLokiCustomRedirects]
diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 221058ee..2d93adc8 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -4,9 +4,8 @@
     "https://piped.kavin.rocks",
     "https://piped.tokhmi.xyz",
     "https://piped.moomoo.me",
-    "https://piped.syncpundit.com",
     "https://piped.mha.fi",
-    "https://jp-piped.shimul.me",
+    "https://de-piped.shimul.me",
     "https://pipedus.palash.dev",
     "https://piped.waffle.wiki",
     "https://watch.whatever.social",
@@ -62,6 +61,7 @@
     "https://n.hyperborea.cloud",
     "https://nitter.spaceint.fr",
     "https://bibliogram.snopyta.org",
+    "https://libredd.it",
     "https://libreddit.autarkic.org",
     "https://libreddit.notyourcomputer.net",
     "https://anon.sx",
diff --git a/src/instances/data.json b/src/instances/data.json
index c5334a47..a1414dbc 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -12,6 +12,7 @@
       "https://invidious.sethforprivacy.com",
       "https://invidious.tiekoetter.com",
       "https://inv.bp.projectsegfau.lt",
+      "https://invidious.projectsegfau.lt",
       "https://inv.vern.cc",
       "https://invidious.nerdvpn.de",
       "https://inv.privacy.com.de",
@@ -19,7 +20,6 @@
       "https://youtube.076.ne.jp",
       "https://invidious.weblibre.org",
       "https://invidious.snopyta.org",
-      "https://invidious.projectsegfau.lt",
       "https://invidious.esmailelbob.xyz",
       "https://invidious.namazso.eu"
     ],
@@ -43,9 +43,8 @@
       "https://piped.tokhmi.xyz",
       "https://piped.moomoo.me",
       "https://il.ax",
-      "https://piped.syncpundit.com",
       "https://piped.mha.fi",
-      "https://jp-piped.shimul.me",
+      "https://de-piped.shimul.me",
       "https://pipedus.palash.dev",
       "https://piped.waffle.wiki",
       "https://watch.whatever.social",
@@ -501,7 +500,6 @@
       "https://searx.tuxcloud.net",
       "https://searx.tyil.nl",
       "https://searx.vanwa.tech",
-      "https://searx.vimproved.me",
       "https://searx.webheberg.info",
       "https://searx.xyz",
       "https://searx.zapashcanon.fr",
@@ -519,8 +517,7 @@
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
-      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
-      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -582,6 +579,7 @@
       "https://searx.sev.monster",
       "https://searx.slipfox.xyz/searx",
       "https://searx.tiekoetter.com",
+      "https://searx.vimproved.me",
       "https://searx.zcyph.cc",
       "https://searxng.au/searx",
       "https://searxng.tordenskjold.de",
@@ -603,6 +601,7 @@
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
+      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
       "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
@@ -820,7 +819,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",
-- 
cgit 1.4.1


From d436d6a18a909cd504064405c4747f8d842aaf4b Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sun, 31 Jul 2022 22:35:05 +0000
Subject: update instances

---
 src/instances/data.json | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/data.json b/src/instances/data.json
index a1414dbc..e45d5221 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -3,6 +3,10 @@
     "normal": [
       "https://yewtu.be",
       "https://vid.puffyan.us",
+<<<<<<< HEAD
+=======
+      "https://invidious.snopyta.org",
+>>>>>>> 0b6c717 (update instances)
       "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
       "https://invidious.osi.kr",
@@ -17,11 +21,18 @@
       "https://invidious.nerdvpn.de",
       "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
+<<<<<<< HEAD
       "https://youtube.076.ne.jp",
       "https://invidious.weblibre.org",
       "https://invidious.snopyta.org",
       "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",
@@ -49,6 +60,11 @@
       "https://piped.waffle.wiki",
       "https://watch.whatever.social",
       "https://yt.jae.fi",
+<<<<<<< HEAD
+=======
+      "https://piped.mint.lgbt",
+      "https://piped.privacy.com.de",
+>>>>>>> 0b6c717 (update instances)
       "https://piped.esmailelbob.xyz",
       "https://piped.projectsegfau.lt"
     ],
@@ -483,6 +499,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",
@@ -517,7 +534,12 @@
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
+<<<<<<< HEAD
       "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
+=======
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
+      "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx"
+>>>>>>> 0b6c717 (update instances)
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -562,7 +584,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",
@@ -604,7 +625,6 @@
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
-      "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
       "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
       "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion"
     ],
@@ -732,7 +752,10 @@
     "loki": []
   },
   "peertube": [
+<<<<<<< HEAD
     "https://tube.nogafa.org",
+=======
+>>>>>>> 0b6c717 (update instances)
     "https://www.neptube.io",
     "https://tube.ghk-academy.info",
     "https://pcbu.nl",
-- 
cgit 1.4.1


From 3f87eb032c5a48ff84445f69633a9a55fcc27bbc Mon Sep 17 00:00:00 2001
From: BobIsMyManager <bimmgitsignature.nly8m@simplelogin.co>
Date: Tue, 2 Aug 2022 22:30:21 +0100
Subject: Make lists sensable

---
 src/instances/blacklist.json   |  4 +--
 src/instances/data.json        | 58 +++---------------------------------------
 src/instances/get_instances.py |  2 +-
 3 files changed, 6 insertions(+), 58 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 77aec738..e7756f8e 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -6,7 +6,6 @@
     "https://piped.moomoo.me",
     "https://piped.mha.fi",
     "https://de-piped.shimul.me",
-    "https://jp-piped.shimul.me",
     "https://pipedus.palash.dev",
     "https://piped.waffle.wiki",
     "https://watch.whatever.social",
@@ -68,7 +67,6 @@
     "https://jsearch.pw",
     "https://searx.gnu.style",
     "https://searx.semipvt.com",
-    "https://searx.vanwa.tech",
     "https://etsi.me",
     "https://s.zhaocloud.net",
     "https://search.vidhukant.xyz",
@@ -81,4 +79,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 76c9f6d3..3e82842c 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -3,13 +3,6 @@
     "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",
@@ -19,29 +12,16 @@
       "https://invidious.sethforprivacy.com",
       "https://invidious.tiekoetter.com",
       "https://inv.bp.projectsegfau.lt",
+      "https://invidious.projectsegfau.lt",
       "https://inv.vern.cc",
       "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",
@@ -64,23 +44,12 @@
       "https://piped.moomoo.me",
       "https://il.ax",
       "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"
     ],
@@ -515,7 +484,6 @@
       "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",
@@ -533,7 +501,6 @@
       "https://searx.tuxcloud.net",
       "https://searx.tyil.nl",
       "https://searx.vanwa.tech",
-      "https://searx.vimproved.me",
       "https://searx.webheberg.info",
       "https://searx.xyz",
       "https://searx.zapashcanon.fr",
@@ -551,17 +518,7 @@
       "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",
@@ -606,6 +563,7 @@
       "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",
@@ -622,10 +580,7 @@
       "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",
@@ -647,8 +602,10 @@
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
+      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
+      "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
       "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
       "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion"
     ],
@@ -776,14 +733,7 @@
     "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",
diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py
index 07adbceb..eab4a924 100644
--- a/src/instances/get_instances.py
+++ b/src/instances/get_instances.py
@@ -92,7 +92,7 @@ def is_authenticate(url):
 def is_offline(url):
     try:
         r = requests.get(url, timeout=5)
-        if r.status_code != 200:
+        if r.status_code >= 400:
             print(url + ' is ' + Fore.RED + 'offline' + Style.RESET_ALL)
             print("Status code")
             print(r.status_code)
-- 
cgit 1.4.1


From 029b7b09d5ab5c7fee25f4956c2e7e26da5f1c9d Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Thu, 4 Aug 2022 22:42:51 +0000
Subject: update instances

---
 src/instances/blacklist.json | 14 +++++++++++---
 src/instances/data.json      | 12 +++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 642a6639..b8b04a01 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -1,11 +1,11 @@
 {
   "cloudflare": [
     "https://invidious.kavin.rocks",
+    "https://piped.kavin.rocks",
     "https://piped.tokhmi.xyz",
     "https://piped.moomoo.me",
-    "https://piped.syncpundit.com",
     "https://piped.mha.fi",
-    "https://jp-piped.shimul.me",
+    "https://us-piped.shimul.me",
     "https://pipedus.palash.dev",
     "https://piped.waffle.wiki",
     "https://watch.whatever.social",
@@ -59,10 +59,16 @@
     "https://invidious.snopyta.org",
     "https://tok.habedieeh.re",
     "https://n.hyperborea.cloud",
+    "https://de.nttr.stream",
+    "https://twitter.dr460nf1r3.org",
+    "https://nitter.catalyst.sx",
     "https://bibliogram.snopyta.org",
-    "https://insta.trom.tf",
     "https://libreddit.autarkic.org",
+    "https://de.leddit.xyz",
+    "https://reddi.tk",
     "https://libreddit.notyourcomputer.net",
+    "https://reddit.dr460nf1r3.org",
+    "https://translate.dr460nf1r3.org",
     "https://anon.sx",
     "https://jsearch.pw",
     "https://searx.gnu.style",
@@ -73,7 +79,9 @@
     "https://searx.ericaftereric.top",
     "https://searx.fmac.xyz",
     "https://searxng.au/searx",
+    "https://www.webrats.xyz",
     "https://search.albony.xyz",
+    "https://search.dr460nf1r3.org",
     "https://whoogle.esmailelbob.xyz",
     "https://beatbump.ml",
     "https://stube.tokhmi.xyz"
diff --git a/src/instances/data.json b/src/instances/data.json
index 0565348b..bc44745b 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -7,6 +7,7 @@
       "https://inv.riverside.rocks",
       "https://invidious.osi.kr",
       "https://y.com.sb",
+      "https://yt.artemislena.eu",
       "https://invidious.flokinet.to",
       "https://invidious.sethforprivacy.com",
       "https://invidious.tiekoetter.com",
@@ -20,7 +21,6 @@
       "https://invidious.weblibre.org",
       "https://invidious.snopyta.org",
       "https://invidious.esmailelbob.xyz",
-      "https://yt.artemislena.eu",
       "https://invidious.namazso.eu"
     ],
     "tor": [
@@ -39,12 +39,12 @@
   },
   "piped": {
     "normal": [
+      "https://piped.kavin.rocks",
       "https://piped.tokhmi.xyz",
       "https://piped.moomoo.me",
       "https://il.ax",
-      "https://piped.syncpundit.com",
       "https://piped.mha.fi",
-      "https://jp-piped.shimul.me",
+      "https://us-piped.shimul.me",
       "https://pipedus.palash.dev",
       "https://piped.waffle.wiki",
       "https://watch.whatever.social",
@@ -478,7 +478,6 @@
       "https://dynabyte.ca",
       "https://jsearch.pw",
       "https://northboot.xyz",
-      "https://search.affusio.com",
       "https://search.ethibox.fr",
       "https://search.snopyta.org",
       "https://search.stinpriza.org",
@@ -494,7 +493,6 @@
       "https://searx.netzspielplatz.de",
       "https://searx.nixnet.services",
       "https://searx.org",
-      "https://searx.rasp.fr",
       "https://searx.ru",
       "https://searx.run",
       "https://searx.semipvt.com",
@@ -518,7 +516,6 @@
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
-      "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
@@ -544,6 +541,7 @@
       "https://s.zhaocloud.net",
       "https://saber.tk",
       "https://search.0relay.com",
+      "https://search.affusio.com",
       "https://search.ashs.club",
       "https://search.bingowaves.xyz",
       "https://search.bus-hit.me",
@@ -601,6 +599,7 @@
       "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
       "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
+      "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
@@ -1381,7 +1380,6 @@
     "https://peertube.inapurna.org",
     "https://watch.libertaria.space",
     "https://video.triplea.fr",
-    "https://video.catgirl.biz",
     "https://vulgarisation-informatique.fr",
     "https://tube.kotur.org",
     "https://peertube.euskarabildua.eus",
-- 
cgit 1.4.1


From d271f48c3c41153ce916de440bfd81207ab0f090 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sun, 7 Aug 2022 22:42:59 +0000
Subject: update instances

---
 src/instances/blacklist.json |  7 ++++---
 src/instances/data.json      | 47 +++++++++++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 23 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index b8b04a01..32a65427 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -56,18 +56,18 @@
     "https://nitter:nitter@nitter.nixnet.services"
   ],
   "offline": [
-    "https://invidious.snopyta.org",
     "https://tok.habedieeh.re",
     "https://n.hyperborea.cloud",
-    "https://de.nttr.stream",
     "https://twitter.dr460nf1r3.org",
     "https://nitter.catalyst.sx",
     "https://bibliogram.snopyta.org",
+    "https://bibliogram.privacydev.net",
     "https://libreddit.autarkic.org",
-    "https://de.leddit.xyz",
+    "https://lr.vern.cc",
     "https://reddi.tk",
     "https://libreddit.notyourcomputer.net",
     "https://reddit.dr460nf1r3.org",
+    "https://teddit.froth.zone",
     "https://translate.dr460nf1r3.org",
     "https://anon.sx",
     "https://jsearch.pw",
@@ -83,6 +83,7 @@
     "https://search.albony.xyz",
     "https://search.dr460nf1r3.org",
     "https://whoogle.esmailelbob.xyz",
+    "https://lbry.bcow.xyz",
     "https://beatbump.ml",
     "https://stube.tokhmi.xyz"
   ]
diff --git a/src/instances/data.json b/src/instances/data.json
index bc44745b..6f9370b8 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -3,6 +3,7 @@
     "normal": [
       "https://yewtu.be",
       "https://vid.puffyan.us",
+      "https://invidious.snopyta.org",
       "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
       "https://invidious.osi.kr",
@@ -17,11 +18,10 @@
       "https://invidious.nerdvpn.de",
       "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
-      "https://youtube.076.ne.jp",
       "https://invidious.weblibre.org",
-      "https://invidious.snopyta.org",
-      "https://invidious.esmailelbob.xyz",
-      "https://invidious.namazso.eu"
+      "https://youtube.076.ne.jp",
+      "https://invidious.namazso.eu",
+      "https://invidious.esmailelbob.xyz"
     ],
     "tor": [
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
@@ -42,7 +42,6 @@
       "https://piped.kavin.rocks",
       "https://piped.tokhmi.xyz",
       "https://piped.moomoo.me",
-      "https://il.ax",
       "https://piped.mha.fi",
       "https://us-piped.shimul.me",
       "https://pipedus.palash.dev",
@@ -50,6 +49,7 @@
       "https://watch.whatever.social",
       "https://yt.jae.fi",
       "https://piped.mint.lgbt",
+      "https://il.ax",
       "https://piped.esmailelbob.xyz",
       "https://piped.projectsegfau.lt"
     ],
@@ -409,7 +409,9 @@
       "https://quetre.projectsegfau.lt",
       "https://quetre.esmailelbob.xyz"
     ],
-    "tor": [],
+    "tor": [
+      "http://quetre.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion"
+    ],
     "i2p": [],
     "loki": []
   },
@@ -421,7 +423,9 @@
       "https://lmdb.tokhmi.xyz",
       "https://libremdb.esmailelbob.xyz"
     ],
-    "tor": [],
+    "tor": [
+      "http://libremdb.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion"
+    ],
     "i2p": [],
     "loki": []
   },
@@ -447,7 +451,8 @@
     "tor": [
       "http://fyng2tsmzmvxmojzbbwmfnsn2lrcyftf4cw6rk5j2v2huliazud3fjid.onion",
       "http://xxtbwyb5z5bdvy2f6l2yquu5qilgkjeewno4qfknvb3lkg3nmoklitid.onion",
-      "http://translate.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion"
+      "http://translate.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion",
+      "http://simplytranslate.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion"
     ],
     "i2p": [
       "http://kmnkkp4v4ublygtnyq46oacy3qw75nrxxniriuaersumw7bfsm2a.b32.i2p"
@@ -477,7 +482,8 @@
       "https://anon.sx",
       "https://dynabyte.ca",
       "https://jsearch.pw",
-      "https://northboot.xyz",
+      "https://search.ashs.club",
+      "https://search.bingowaves.xyz",
       "https://search.ethibox.fr",
       "https://search.snopyta.org",
       "https://search.stinpriza.org",
@@ -515,7 +521,9 @@
     ],
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
-      "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
+      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
+      "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
+      "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
@@ -533,6 +541,7 @@
       "https://de.xcxc.ml",
       "https://etsi.me",
       "https://jackgoss.xyz",
+      "https://northboot.xyz",
       "https://opnxng.com",
       "https://paulgo.io",
       "https://priv.au",
@@ -542,8 +551,6 @@
       "https://saber.tk",
       "https://search.0relay.com",
       "https://search.affusio.com",
-      "https://search.ashs.club",
-      "https://search.bingowaves.xyz",
       "https://search.bus-hit.me",
       "https://search.chemicals-in-the-water.eu",
       "https://search.disroot.org",
@@ -569,6 +576,7 @@
       "https://searx.fi",
       "https://searx.fmac.xyz",
       "https://searx.gnous.eu",
+      "https://searx.kujonello.cf",
       "https://searx.mha.fi",
       "https://searx.mistli.net",
       "https://searx.namejeff.xyz",
@@ -591,17 +599,17 @@
       "https://srx.cosmohub.io",
       "https://swag.pw",
       "https://www.gruble.de",
+      "https://www.higgssearch.com",
       "https://www.webrats.xyz",
       "https://xcxc.ml",
       "https://xo.wtf"
     ],
     "tor": [
-      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
-      "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
-      "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
+      "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
+      "http://searx.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
@@ -711,7 +719,9 @@
       "https://hyperpipe.surge.sh",
       "https://hyperpipe.esmailelbob.xyz"
     ],
-    "tor": [],
+    "tor": [
+      "http://hyperpipe.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion"
+    ],
     "i2p": [],
     "loki": []
   },
@@ -734,6 +744,7 @@
     "loki": []
   },
   "peertube": [
+    "https://video.ut0pia.org",
     "https://kinotu.be",
     "https://tube.nogafa.org",
     "https://www.neptube.io",
@@ -830,7 +841,6 @@
     "https://phijkchu.com",
     "https://video.lycee-experimental.org",
     "https://galileo.news",
-    "https://peertube.otakufarms.com",
     "https://tube.motuhake.xyz",
     "https://pt.m0r016.net",
     "https://hitchtube.fr",
@@ -971,7 +981,6 @@
     "https://truvitv.com",
     "https://pt.ilyamikcoder.com",
     "https://peertube.sensin.eu",
-    "https://watch.riverside.rocks",
     "https://sharetube.us",
     "https://video.sadmin.io",
     "https://stream.jurnalfm.md",
@@ -1300,7 +1309,6 @@
     "https://video.gyt.is",
     "https://peertube.jensdiemer.de",
     "https://tube.futuretic.fr",
-    "https://libra.syntazia.org",
     "https://peertube.beeldengeluid.nl",
     "https://tv.lumbung.space",
     "https://peertube.cuatrolibertades.org",
@@ -1613,7 +1621,6 @@
     "https://peertube.netzbegruenung.de",
     "https://plextube.nl",
     "https://tube.opportunis.me",
-    "https://nanawel-peertube.dyndns.org",
     "https://tube-strasbourg.beta.education.fr",
     "https://tube.graz.social",
     "https://tube-besancon.beta.education.fr",
-- 
cgit 1.4.1


From 37264f8aa865014beff07421b5b6bccd942bf84a Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Wed, 10 Aug 2022 22:41:39 +0000
Subject: update instances

---
 src/instances/blacklist.json |  9 +--------
 src/instances/data.json      | 35 ++++++++++++++---------------------
 2 files changed, 15 insertions(+), 29 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 32a65427..4dd94cff 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -7,7 +7,6 @@
     "https://piped.mha.fi",
     "https://us-piped.shimul.me",
     "https://pipedus.palash.dev",
-    "https://piped.waffle.wiki",
     "https://watch.whatever.social",
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
@@ -23,7 +22,6 @@
     "https://bib.actionsack.com",
     "https://libreddit.domain.glass",
     "https://r.nf",
-    "https://lr.oversold.host",
     "https://libreddit.hu",
     "https://lr.stilic.ml",
     "https://reddi.tk",
@@ -44,7 +42,6 @@
     "https://translate.dr460nf1r3.org",
     "https://searx.org",
     "https://searx.run",
-    "https://search.albony.xyz",
     "https://search.garudalinux.org",
     "https://search.dr460nf1r3.org",
     "https://search.wef.lol",
@@ -57,17 +54,14 @@
   ],
   "offline": [
     "https://tok.habedieeh.re",
-    "https://n.hyperborea.cloud",
     "https://twitter.dr460nf1r3.org",
     "https://nitter.catalyst.sx",
     "https://bibliogram.snopyta.org",
-    "https://bibliogram.privacydev.net",
+    "https://insta.tromdienste.de",
     "https://libreddit.autarkic.org",
-    "https://lr.vern.cc",
     "https://reddi.tk",
     "https://libreddit.notyourcomputer.net",
     "https://reddit.dr460nf1r3.org",
-    "https://teddit.froth.zone",
     "https://translate.dr460nf1r3.org",
     "https://anon.sx",
     "https://jsearch.pw",
@@ -80,7 +74,6 @@
     "https://searx.fmac.xyz",
     "https://searxng.au/searx",
     "https://www.webrats.xyz",
-    "https://search.albony.xyz",
     "https://search.dr460nf1r3.org",
     "https://whoogle.esmailelbob.xyz",
     "https://lbry.bcow.xyz",
diff --git a/src/instances/data.json b/src/instances/data.json
index 6f9370b8..c95d3d1a 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -45,11 +45,11 @@
       "https://piped.mha.fi",
       "https://us-piped.shimul.me",
       "https://pipedus.palash.dev",
-      "https://piped.waffle.wiki",
       "https://watch.whatever.social",
       "https://yt.jae.fi",
       "https://piped.mint.lgbt",
       "https://il.ax",
+      "https://piped.privacy.com.de",
       "https://piped.esmailelbob.xyz",
       "https://piped.projectsegfau.lt"
     ],
@@ -83,8 +83,8 @@
     "normal": [
       "https://proxitok.herokuapp.com",
       "https://proxitok.pussthecat.org",
-      "https://proxitok.privacydev.net",
-      "https://tok.habedieeh.re"
+      "https://tok.habedieeh.re",
+      "https://proxitok.esmailelbob.xyz"
     ],
     "tor": [],
     "i2p": [],
@@ -133,7 +133,6 @@
       "https://nitter.it",
       "https://twitter.censors.us",
       "https://nitter.grimneko.de",
-      "https://n.hyperborea.cloud",
       "https://nitter.ca",
       "https://twitter.076.ne.jp",
       "https://nitter.fly.dev",
@@ -154,7 +153,6 @@
       "https://nitter.spaceint.fr",
       "https://twtr.bch.bar",
       "https://nitter.privacy.com.de",
-      "https://nitter.mastodon.pro",
       "https://nitter.notraxx.ch",
       "https://nitter.poast.org",
       "https://nitter.bird.froth.zone",
@@ -170,7 +168,6 @@
       "https://nitter.kylrth.com",
       "https://nitter.foss.wtf",
       "https://nitter.priv.pw",
-      "https://nt.vern.cc",
       "https://nitter.wef.lol",
       "https://nitter.tokhmi.xyz",
       "https://nitter.catalyst.sx",
@@ -229,7 +226,6 @@
       "https://insta.tromdienste.de",
       "https://ig.tokhmi.xyz",
       "https://ig.beparanoid.de",
-      "https://bibliogram.privacydev.net",
       "https://bibliogram.priv.pw",
       "https://ig.funami.tech",
       "https://bib.actionsack.com"
@@ -517,13 +513,13 @@
       "https://suche.uferwerk.org",
       "https://sx.catgirl.cloud",
       "https://timdor.noip.me/searx",
+      "https://xcxc.ml",
       "https://searx.roflcopter.fr"
     ],
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
-      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
-      "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
       "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
+      "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
@@ -593,6 +589,7 @@
       "https://searxng.au/searx",
       "https://searxng.tordenskjold.de",
       "https://searxng.zackptg5.com",
+      "https://searxvm.com",
       "https://serx.ml",
       "https://sh0.it",
       "https://soek.allesbeste.com",
@@ -601,13 +598,13 @@
       "https://www.gruble.de",
       "https://www.higgssearch.com",
       "https://www.webrats.xyz",
-      "https://xcxc.ml",
       "https://xo.wtf"
     ],
     "tor": [
+      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
+      "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
-      "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://searx.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
@@ -643,16 +640,19 @@
   "librex": {
     "normal": [
       "https://librex.beparanoid.de",
+      "https://librex.extravi.dev",
       "https://search.davidovski.xyz",
       "https://search.funami.tech",
       "https://librex.catalyst.sx"
     ],
     "tor": [
       "http://librex.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion",
+      "http://ncblhz7q4sfbf755bdbhebfzxcpypz7ewafgi4agatecojz7pln4i3id.onion",
       "http://librex.so2mpiyfo4cje7bof5v52y3cvjyo2haxpqfvut4sr6gj2ul4mddx2jid.onion"
     ],
     "i2p": [
-      "http://fboseyskrqpi6yjiifvz4ryuoiswjezkqsfxfkm2vmbuhehbpr7q.b32.i2p"
+      "http://ljluyti43556bflsucfkhegelemo6guchmq4g7ebxuentomupxoa.b32.i2p",
+      "http://rra33hiaf6nmby7jfpqe2gqmng3jnzkvbu2n7jgce7vbhoyuhzya.b32.i2p"
     ],
     "loki": []
   },
@@ -744,6 +744,8 @@
     "loki": []
   },
   "peertube": [
+    "https://jzqk.org",
+    "https://tube.xsoftware.it",
     "https://video.ut0pia.org",
     "https://kinotu.be",
     "https://tube.nogafa.org",
@@ -761,7 +763,6 @@
     "https://tube-cycle-3.apps.education.fr",
     "https://video.manicphase.me",
     "https://tube.emy.plus",
-    "https://v.bearvideo.win",
     "https://tubulus.openlatin.org",
     "https://peertube.securetown.top",
     "https://tv.datamol.org",
@@ -795,14 +796,12 @@
     "https://video.uriopss-pdl.fr",
     "https://pt.bolapara.mywire.org",
     "https://ptube.ranranhome.info",
-    "https://vidid.pl",
     "https://video.3cmr.fr",
     "https://tube.die-rote-front.de",
     "https://peertube.miguelcr.me",
     "https://video.thinkof.name",
     "https://nekofans.tv",
     "https://video.comun.al",
-    "https://peertube.nrsk.no",
     "https://video.occm.cc",
     "https://peertube.viviers-fibre.net",
     "https://tube-action-educative.apps.education.fr",
@@ -831,7 +830,6 @@
     "https://see.vtopia.live",
     "https://peertube.letoine.fr",
     "https://tube-enseignement-professionnel.apps.education.fr",
-    "https://socpeertube.ru",
     "https://videos.laliguepaysdelaloire.org",
     "https://quantube.win",
     "https://twctube.twc-zone.eu",
@@ -869,7 +867,6 @@
     "https://peertube.chaunchy.com",
     "https://tube.vrpnet.org",
     "https://video.tii.space",
-    "https://peertube.inubo.ch",
     "https://nightshift.minnix.dev",
     "https://tube.friloux.me",
     "https://peertube.virtual-assembly.org",
@@ -958,7 +955,6 @@
     "https://videos.sadx.moe",
     "https://pt.nospy.net",
     "https://yhwh.tube",
-    "https://peerlook.ru",
     "https://tube.kicou.info",
     "https://video.aqr.af",
     "https://videos-passages.huma-num.fr",
@@ -1034,7 +1030,6 @@
     "https://poast.tv",
     "https://testube.distrilab.fr",
     "https://peertube.rse43.com",
-    "https://libremedia.video",
     "https://vid.lelux.fi",
     "https://v.wolfskaempf.de",
     "https://peertube.chevro.fr",
@@ -1326,7 +1321,6 @@
     "https://peertube.radres.xyz",
     "https://darkvapor.nohost.me",
     "https://tube.chaoszone.tv",
-    "https://media.over-world.org",
     "https://tube.avensio.de",
     "https://peertube.klaewyss.fr",
     "https://sender-fm.veezee.tube",
@@ -1649,7 +1643,6 @@
     "https://mplayer.demouliere.eu",
     "https://video.liberta.vip",
     "https://peertube.gcfamily.fr",
-    "https://video.ploud.fr",
     "https://tube.plaf.fr",
     "https://tube.nah.re",
     "https://dreiecksnebel.alex-detsch.de",
-- 
cgit 1.4.1


From d375ef8f4b338628e0031f9c5440e04f763ec132 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sat, 13 Aug 2022 22:42:30 +0000
Subject: update instances

---
 src/instances/blacklist.json | 13 ++++++++---
 src/instances/data.json      | 52 ++++++++++++++++++++------------------------
 2 files changed, 34 insertions(+), 31 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 4dd94cff..0c9a8502 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -8,6 +8,7 @@
     "https://us-piped.shimul.me",
     "https://pipedus.palash.dev",
     "https://watch.whatever.social",
+    "https://cringe.whatever.social",
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
     "https://notabird.site",
@@ -37,7 +38,9 @@
     "https://teddit.encrypted-data.xyz",
     "https://teddit.garudalinux.org",
     "https://tedd.it",
+    "https://wiki.privacytools.io",
     "https://wiki.604kph.xyz",
+    "https://wiki.privacytools.io",
     "https://lingva.garudalinux.org",
     "https://translate.dr460nf1r3.org",
     "https://searx.org",
@@ -47,21 +50,26 @@
     "https://search.wef.lol",
     "https://i.actionsack.com",
     "https://rimgo.encrypted-data.xyz",
-    "https://beatbump.ml"
+    "https://beatbump.ml",
+    "https://listen.whatever.social"
   ],
   "authenticate": [
     "https://nitter:nitter@nitter.nixnet.services"
   ],
   "offline": [
+    "https://invidious.kavin.rocks",
+    "https://invidious.osi.kr",
     "https://tok.habedieeh.re",
     "https://twitter.dr460nf1r3.org",
     "https://nitter.catalyst.sx",
+    "https://twt.funami.tech",
     "https://bibliogram.snopyta.org",
-    "https://insta.tromdienste.de",
+    "https://ig.beparanoid.de",
     "https://libreddit.autarkic.org",
     "https://reddi.tk",
     "https://libreddit.notyourcomputer.net",
     "https://reddit.dr460nf1r3.org",
+    "https://translate.riverside.rocks",
     "https://translate.dr460nf1r3.org",
     "https://anon.sx",
     "https://jsearch.pw",
@@ -76,7 +84,6 @@
     "https://www.webrats.xyz",
     "https://search.dr460nf1r3.org",
     "https://whoogle.esmailelbob.xyz",
-    "https://lbry.bcow.xyz",
     "https://beatbump.ml",
     "https://stube.tokhmi.xyz"
   ]
diff --git a/src/instances/data.json b/src/instances/data.json
index c95d3d1a..eb987ff1 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -4,9 +4,7 @@
       "https://yewtu.be",
       "https://vid.puffyan.us",
       "https://invidious.snopyta.org",
-      "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
-      "https://invidious.osi.kr",
       "https://y.com.sb",
       "https://yt.artemislena.eu",
       "https://invidious.flokinet.to",
@@ -18,10 +16,12 @@
       "https://invidious.nerdvpn.de",
       "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
-      "https://invidious.weblibre.org",
       "https://youtube.076.ne.jp",
+      "https://invidious.weblibre.org",
+      "https://invidious.kavin.rocks",
       "https://invidious.namazso.eu",
-      "https://invidious.esmailelbob.xyz"
+      "https://invidious.esmailelbob.xyz",
+      "https://invidious.osi.kr"
     ],
     "tor": [
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
@@ -50,8 +50,7 @@
       "https://piped.mint.lgbt",
       "https://il.ax",
       "https://piped.privacy.com.de",
-      "https://piped.esmailelbob.xyz",
-      "https://piped.projectsegfau.lt"
+      "https://piped.esmailelbob.xyz"
     ],
     "tor": [],
     "i2p": [],
@@ -84,7 +83,9 @@
       "https://proxitok.herokuapp.com",
       "https://proxitok.pussthecat.org",
       "https://tok.habedieeh.re",
-      "https://proxitok.esmailelbob.xyz"
+      "https://proxitok.esmailelbob.xyz",
+      "https://cringe.whatever.social",
+      "https://proxitok.dhusch.de"
     ],
     "tor": [],
     "i2p": [],
@@ -181,7 +182,8 @@
       "https://nederland.unofficialbird.com",
       "https://uk.unofficialbird.com",
       "https://n.l5.ca",
-      "https://nitter.slipfox.xyz"
+      "https://nitter.slipfox.xyz",
+      "https://nitter.soopy.moe"
     ],
     "tor": [
       "http://nitter7bryz3jv7e3uekphigvmoyoem4al3fynerxkj22dmoxoq553qd.onion",
@@ -343,7 +345,8 @@
       "https://i.opnxng.com",
       "https://teddit.tokhmi.xyz",
       "https://teddit.garudalinux.org",
-      "https://tedd.it"
+      "https://tedd.it",
+      "https://wiki.privacytools.io"
     ],
     "tor": [
       "http://snoo.ioensistjs7wd746zluwixvojbbkxhr37lepdvwtdfeav673o64iflqd.onion",
@@ -366,18 +369,22 @@
       "https://wikiless.tiekoetter.com",
       "https://wikiless.esmailelbob.xyz",
       "https://wiki.slipfox.xyz",
-      "https://wikiless.funami.tech"
+      "https://wikiless.funami.tech",
+      "https://wl.vern.cc",
+      "https://wiki.privacytools.io"
     ],
     "tor": [
       "http://dj2tbh2nqfxyfmvq33cjmhuw7nb6am7thzd3zsjvizeqf374fixbrxyd.onion",
       "http://ybgg2evrcdz37y2qes23ff3wjqjdn33tthgoagi76vhxytu4mpxiz5qd.onion",
       "http://wikiless.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
-      "http://c2pesewpalbi6lbfc5hf53q4g3ovnxe4s7tfa6k2aqkf7jd7a7dlz5ad.onion"
+      "http://c2pesewpalbi6lbfc5hf53q4g3ovnxe4s7tfa6k2aqkf7jd7a7dlz5ad.onion",
+      "http://wl.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
     ],
     "i2p": [
       "http://wikiless.i2p",
       "http://hflqp2ejxygpj6cdwo3ogfieqmxw3b56w7dblt7bor2ltwk6kcfa.b32.i2p",
-      "http://x33lx4h6d7h6xs4eiqwhvaxn3ea5gn2ifmu3jobnvuvn4k4aej7a.b32.i2p"
+      "http://x33lx4h6d7h6xs4eiqwhvaxn3ea5gn2ifmu3jobnvuvn4k4aej7a.b32.i2p",
+      "http://vernesciy2defjsputrjrv6pa5ll6qzrckfffi5lgkumstdojyga.b32.i2p"
     ],
     "loki": []
   },
@@ -478,8 +485,6 @@
       "https://anon.sx",
       "https://dynabyte.ca",
       "https://jsearch.pw",
-      "https://search.ashs.club",
-      "https://search.bingowaves.xyz",
       "https://search.ethibox.fr",
       "https://search.snopyta.org",
       "https://search.stinpriza.org",
@@ -513,12 +518,10 @@
       "https://suche.uferwerk.org",
       "https://sx.catgirl.cloud",
       "https://timdor.noip.me/searx",
-      "https://xcxc.ml",
       "https://searx.roflcopter.fr"
     ],
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
-      "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
@@ -563,6 +566,7 @@
       "https://search.unlocked.link",
       "https://search.vidhukant.xyz",
       "https://search.zzls.xyz",
+      "https://searx.baczek.me",
       "https://searx.be",
       "https://searx.becomesovran.com",
       "https://searx.chocoflan.net",
@@ -598,6 +602,7 @@
       "https://www.gruble.de",
       "https://www.higgssearch.com",
       "https://www.webrats.xyz",
+      "https://xcxc.ml",
       "https://xo.wtf"
     ],
     "tor": [
@@ -684,7 +689,7 @@
       "https://lbry.bcow.xyz",
       "https://odysee.076.ne.jp",
       "https://librarian.pussthecat.org",
-      "https://lbry.mutahar.rocks",
+      "https://lbry.projectsegfau.lt",
       "https://librarian.esmailelbob.xyz",
       "https://lbry.vern.cc",
       "https://lbry.slipfox.xyz"
@@ -717,7 +722,8 @@
   "hyperpipe": {
     "normal": [
       "https://hyperpipe.surge.sh",
-      "https://hyperpipe.esmailelbob.xyz"
+      "https://hyperpipe.esmailelbob.xyz",
+      "https://listen.whatever.social"
     ],
     "tor": [
       "http://hyperpipe.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion"
@@ -754,7 +760,6 @@
     "https://pcbu.nl",
     "https://soberania.tv",
     "https://pire.artisanlogiciel.net",
-    "https://trutube.xyz",
     "https://tube-test.apps.education.fr",
     "https://tube-sciences-technologies.apps.education.fr",
     "https://stream.conesphere.cloud",
@@ -767,12 +772,10 @@
     "https://peertube.securetown.top",
     "https://tv.datamol.org",
     "https://video.graine-pdl.org",
-    "https://tube.zee.li",
     "https://tube-cycle-2.apps.education.fr",
     "https://mikeclips.net",
     "https://tube.s1gm4.eu",
     "https://videos.keyedlimepie.org",
-    "https://video.cpn.so",
     "https://video.davduf.net",
     "https://tube.oldkid.digital",
     "https://tube.fofoca.eu",
@@ -783,7 +786,6 @@
     "https://media.theplattform.net",
     "https://peertube.offerman.com",
     "https://v.lastorder.xyz",
-    "https://video.eradicatinglove.xyz",
     "https://peertube.thele.me",
     "https://video.schnitzler.one",
     "https://tube.cybershock.life",
@@ -812,7 +814,6 @@
     "https://tube.hunterjozwiak.com",
     "https://tube-numerique-educatif.apps.education.fr",
     "https://tube.itsg.host",
-    "https://tube.valinor.fr",
     "https://lucarne.balsamine.be",
     "https://peertube.suranyami.com",
     "https://video.ados.accoord.fr",
@@ -846,7 +847,6 @@
     "https://peertube.ctrl-c.liu.se",
     "https://peertube.live",
     "https://video.slipfox.xyz",
-    "https://pt.vern.cc",
     "https://vnop.org",
     "https://videos.cassidypunchmachine.com",
     "https://tv1.gomntu.space",
@@ -914,7 +914,6 @@
     "https://cliptube.org",
     "https://tube.tr4sk.me",
     "https://videos.campdarling.com",
-    "https://video.mikka.md",
     "https://www.aktion-nordost.tv",
     "https://tube.rooty.fr",
     "https://tube.dnet.one",
@@ -986,7 +985,6 @@
     "https://tv.suwerenni.org",
     "https://tube.revertron.com",
     "https://tube.erzbistum-hamburg.de",
-    "https://video.germanische-heilkunde.at",
     "https://views.southfox.me",
     "https://vide.oxel.me",
     "https://video.mttv.it",
@@ -1618,7 +1616,6 @@
     "https://tube-strasbourg.beta.education.fr",
     "https://tube.graz.social",
     "https://tube-besancon.beta.education.fr",
-    "https://vid.garwood.io",
     "https://kolektiva.media",
     "https://peertube.ichigo.everydayimshuflin.com",
     "https://video.lundi.am",
@@ -1730,7 +1727,6 @@
     "https://peertube.makotoworkshop.org",
     "https://peertube.serveur.slv-valbonne.fr",
     "https://video.netsyms.com",
-    "https://video.writeas.org",
     "https://videos.adhocmusic.com",
     "https://vid.y-y.li",
     "https://diode.zone",
-- 
cgit 1.4.1


From 3619bd96364ad04d7fcc6b948253e9b385de90c5 Mon Sep 17 00:00:00 2001
From: Woodpecker CI <woodpecker@codeberg.org>
Date: Mon, 19 Sep 2022 00:08:42 +0000
Subject: updated instances

---
 src/instances/blacklist.json |  59 +++++----
 src/instances/data.json      | 301 +++++++++++++++++++++----------------------
 2 files changed, 181 insertions(+), 179 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 0c9a8502..9df5b306 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -1,13 +1,16 @@
 {
   "cloudflare": [
     "https://invidious.kavin.rocks",
+    "https://invidious.rhyshl.live",
     "https://piped.kavin.rocks",
     "https://piped.tokhmi.xyz",
     "https://piped.moomoo.me",
     "https://piped.mha.fi",
-    "https://us-piped.shimul.me",
+    "https://de-piped.shimul.me",
     "https://pipedus.palash.dev",
     "https://watch.whatever.social",
+    "https://piped.garudalinux.org",
+    "https://y.rivo.lol",
     "https://cringe.whatever.social",
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
@@ -17,10 +20,14 @@
     "https://twtr.bch.bar",
     "https://twitter.dr460nf1r3.org",
     "https://nitter.garudalinux.org",
-    "https://nitter.wef.lol",
     "https://nitter.catalyst.sx",
     "https://nitter.fprivacy.com",
-    "https://bib.actionsack.com",
+    "https://read.whatever.social",
+    "https://nitter.rawbit.ninja",
+    "https://nitter.privacytools.io",
+    "https://nitter.sneed.network",
+    "https://n.sneed.network",
+    "https://nitter.twei.space",
     "https://libreddit.domain.glass",
     "https://r.nf",
     "https://libreddit.hu",
@@ -39,12 +46,14 @@
     "https://teddit.garudalinux.org",
     "https://tedd.it",
     "https://wiki.privacytools.io",
-    "https://wiki.604kph.xyz",
+    "https://teddit.rawbit.ninja",
     "https://wiki.privacytools.io",
+    "https://wikiless.rawbit.ninja",
+    "https://scribe.rawbit.ninja",
     "https://lingva.garudalinux.org",
     "https://translate.dr460nf1r3.org",
-    "https://searx.org",
     "https://searx.run",
+    "https://searx.org",
     "https://search.garudalinux.org",
     "https://search.dr460nf1r3.org",
     "https://search.wef.lol",
@@ -57,34 +66,34 @@
     "https://nitter:nitter@nitter.nixnet.services"
   ],
   "offline": [
-    "https://invidious.kavin.rocks",
-    "https://invidious.osi.kr",
-    "https://tok.habedieeh.re",
-    "https://twitter.dr460nf1r3.org",
-    "https://nitter.catalyst.sx",
-    "https://twt.funami.tech",
-    "https://bibliogram.snopyta.org",
-    "https://ig.beparanoid.de",
-    "https://libreddit.autarkic.org",
-    "https://reddi.tk",
+    "https://invidious.rhyshl.live",
+    "https://invidious.esmailelbob.xyz",
+    "https://proxitok.odyssey346.dev",
+    "https://nhanh.cloud",
+    "https://nitter.winscloud.net",
+    "https://ntr.odyssey346.dev",
+    "https://r.walkx.org",
+    "https://libreddit.winscloud.net",
     "https://libreddit.notyourcomputer.net",
-    "https://reddit.dr460nf1r3.org",
-    "https://translate.riverside.rocks",
-    "https://translate.dr460nf1r3.org",
-    "https://anon.sx",
+    "https://teddit.ggc-project.de",
+    "https://teddit.nautolan.racing",
+    "https://tedd.it",
+    "https://wiki.froth.zone",
+    "https://quetre.odyssey346.dev",
+    "https://translate.northboot.xyz",
+    "https://st.odyssey346.dev",
     "https://jsearch.pw",
     "https://searx.gnu.style",
     "https://searx.semipvt.com",
     "https://etsi.me",
-    "https://s.zhaocloud.net",
-    "https://search.vidhukant.xyz",
+    "https://search.zzls.xyz",
     "https://searx.ericaftereric.top",
     "https://searx.fmac.xyz",
-    "https://searxng.au/searx",
     "https://www.webrats.xyz",
-    "https://search.dr460nf1r3.org",
     "https://whoogle.esmailelbob.xyz",
-    "https://beatbump.ml",
-    "https://stube.tokhmi.xyz"
+    "https://search.wef.lol",
+    "https://i.bcow.xyz",
+    "https://lbry.bcow.xyz",
+    "https://beatbump.ml"
   ]
 }
\ No newline at end of file
diff --git a/src/instances/data.json b/src/instances/data.json
index eb987ff1..e9533bfe 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -4,35 +4,37 @@
       "https://yewtu.be",
       "https://vid.puffyan.us",
       "https://invidious.snopyta.org",
+      "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
+      "https://invidio.xamh.de",
       "https://y.com.sb",
       "https://yt.artemislena.eu",
-      "https://invidious.flokinet.to",
       "https://invidious.sethforprivacy.com",
+      "https://invidious.flokinet.to",
       "https://invidious.tiekoetter.com",
       "https://inv.bp.projectsegfau.lt",
-      "https://invidious.projectsegfau.lt",
       "https://inv.vern.cc",
+      "https://invidious.projectsegfau.lt",
       "https://invidious.nerdvpn.de",
+      "https://invidious.rhyshl.live",
       "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
-      "https://youtube.076.ne.jp",
       "https://invidious.weblibre.org",
-      "https://invidious.kavin.rocks",
-      "https://invidious.namazso.eu",
       "https://invidious.esmailelbob.xyz",
-      "https://invidious.osi.kr"
+      "https://youtube.076.ne.jp",
+      "https://invidious.namazso.eu"
     ],
     "tor": [
-      "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
-      "http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion",
-      "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion",
-      "http://grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad.onion",
-      "http://osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion",
-      "http://u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad.onion",
-      "http://euxxcnhsynwmfidvhjf6uzptsmh4dipkmgdmcmxxuo7tunp3ad2jrwyd.onion",
+      "http://inv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
       "http://invidious.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
-      "http://inv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
+      "http://euxxcnhsynwmfidvhjf6uzptsmh4dipkmgdmcmxxuo7tunp3ad2jrwyd.onion",
+      "http://u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad.onion",
+      "http://osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion",
+      "http://grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad.onion",
+      "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion",
+      "http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion",
+      "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
+      "http://am74vkcrjp2d5v36lcdqgsj2m6x36tbrkhsruoegwfcizzabnfgf5zyd.onion"
     ],
     "i2p": [],
     "loki": []
@@ -43,14 +45,21 @@
       "https://piped.tokhmi.xyz",
       "https://piped.moomoo.me",
       "https://piped.mha.fi",
-      "https://us-piped.shimul.me",
+      "https://de-piped.shimul.me",
       "https://pipedus.palash.dev",
       "https://watch.whatever.social",
+      "https://piped.garudalinux.org",
+      "https://y.rivo.lol",
       "https://yt.jae.fi",
       "https://piped.mint.lgbt",
       "https://il.ax",
       "https://piped.privacy.com.de",
-      "https://piped.esmailelbob.xyz"
+      "https://piped.projectsegfau.lt",
+      "https://piped.privacydev.net",
+      "https://piped.palveluntarjoaja.eu",
+      "https://piped.smnz.de",
+      "https://piped.adminforge.de",
+      "https://watch.whatevertinfoil.de"
     ],
     "tor": [],
     "i2p": [],
@@ -61,7 +70,8 @@
       "https://piped-material.১.net",
       "https://piped-material.ftp.sh",
       "https://piped-staging.ftp.sh",
-      "https://ui.piped.১.net"
+      "https://ui.piped.১.net",
+      "https://ng.piped.১.net"
     ],
     "tor": [],
     "i2p": [],
@@ -69,23 +79,25 @@
   },
   "cloudtube": {
     "normal": [
-      "https://tube.cadence.moe",
-      "https://yt.beparanoid.de"
-    ],
-    "tor": [
-      "http://yt.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion"
+      "https://tube.cadence.moe"
     ],
+    "tor": [],
     "i2p": [],
     "loki": []
   },
   "proxiTok": {
     "normal": [
-      "https://proxitok.herokuapp.com",
+      "https://proxitok.pabloferreiro.es",
       "https://proxitok.pussthecat.org",
       "https://tok.habedieeh.re",
       "https://proxitok.esmailelbob.xyz",
       "https://cringe.whatever.social",
-      "https://proxitok.dhusch.de"
+      "https://proxitok.dhusch.de",
+      "https://proxitok.privacydev.net",
+      "https://proxitok.odyssey346.dev",
+      "https://tok.artemislena.eu",
+      "https://tok.adminforge.de",
+      "https://proxitok.manasiwibi.com"
     ],
     "tor": [],
     "i2p": [],
@@ -148,13 +160,11 @@
       "https://fuckthesacklers.network",
       "https://nitter.esmailelbob.xyz",
       "https://tw.artemislena.eu",
-      "https://de.nttr.stream",
       "https://nitter.winscloud.net",
       "https://nitter.tiekoetter.com",
       "https://nitter.spaceint.fr",
       "https://twtr.bch.bar",
       "https://nitter.privacy.com.de",
-      "https://nitter.notraxx.ch",
       "https://nitter.poast.org",
       "https://nitter.bird.froth.zone",
       "https://nitter.dcs0.hu",
@@ -164,12 +174,11 @@
       "https://n.ramle.be",
       "https://nitter.cz",
       "https://nitter.privacydev.net",
+      "https://nitter.evil.site",
       "https://tweet.lambda.dance",
-      "https://nitter.ebnar.xyz",
       "https://nitter.kylrth.com",
       "https://nitter.foss.wtf",
       "https://nitter.priv.pw",
-      "https://nitter.wef.lol",
       "https://nitter.tokhmi.xyz",
       "https://nitter.catalyst.sx",
       "https://unofficialbird.com",
@@ -183,7 +192,20 @@
       "https://uk.unofficialbird.com",
       "https://n.l5.ca",
       "https://nitter.slipfox.xyz",
-      "https://nitter.soopy.moe"
+      "https://nitter.soopy.moe",
+      "https://nitter.qwik.space",
+      "https://read.whatever.social",
+      "https://nitter.rawbit.ninja",
+      "https://nt.vern.cc",
+      "https://ntr.odyssey346.dev",
+      "https://nitter.ir",
+      "https://nitter.privacytools.io",
+      "https://nitter.sneed.network",
+      "https://n.sneed.network",
+      "https://nitter.manasiwibi.com",
+      "https://nitter.smnz.de",
+      "https://nitter.twei.space",
+      "https://nitter.inpt.fr"
     ],
     "tor": [
       "http://nitter7bryz3jv7e3uekphigvmoyoem4al3fynerxkj22dmoxoq553qd.onion",
@@ -196,7 +218,7 @@
       "http://jebqj47jgxleaiosfcxfibx2xdahjettuydlxbg64azd4khsxv6kawid.onion",
       "http://nttr2iupbb6fazdpr2rgbooon2tzbbsvvkagkgkwohhodjzj43stxhad.onion",
       "http://nitraeju2mipeziu2wtcrqsxg7h62v5y4eqgwi75uprynkj74gevvuqd.onion",
-      "http://nitter.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
+      "http://nitter.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://ibsboeui2im5o7dxnik3s5yghufumgy5abevtij5nbizequfpu4qi4ad.onion",
       "http://ec5nvbycpfa5k6ro77blxgkyrzbkv7uy6r5cngcbkadtjj2733nm3uyd.onion",
       "http://twitter.ap3jtgssd7qn4vfoa62gi2ijddoblslbeuw5dan3xt7myvqpura5i4qd.onion",
@@ -206,12 +228,17 @@
       "http://nitterqdyumlovt7tjqpdjrluitgmtpa53qq3idlpgoe4kxo7gs3xvad.onion",
       "http://nitter.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://aaaaaxx74hbzeibageieowryhsqvimbdiitfkfe47tvgawkwkjh3coqd.onion",
-      "http://wiio4sgs4247brk7hj6qck2jxnvldwfdbguigc5ivpxrsegnliyfvuqd.onion"
+      "http://wiio4sgs4247brk7hj6qck2jxnvldwfdbguigc5ivpxrsegnliyfvuqd.onion",
+      "http://qwikxx2erhx6qrymued6ox2qkf2yeogjwypqvzoif4fqkljixasr6oid.onion",
+      "http://4g47cxugkohbweao2x66nnxxfoe3k7gdfzxej537nhdbwr522sbjxeqd.onion",
+      "http://tw.lpoaj7z2zkajuhgnlltpeqh3zyq7wk2iyeggqaduhgxhyajtdt2j7wad.onion"
     ],
     "i2p": [
       "http://axd6uavsstsrvstva4mzlzh4ct76rc6zdug3nxdgeitrzczhzf4q.b32.i2p",
       "http://u6ikd6zndl3c4dsdq4mmujpntgeevdk5qzkfb57r4tnfeccrn2qa.b32.i2p",
-      "http://gseczlzmiv23p5vhsktyd7whquq2uy3c5fgkmdohh453qp3daoua.b32.i2p"
+      "http://gseczlzmiv23p5vhsktyd7whquq2uy3c5fgkmdohh453qp3daoua.b32.i2p",
+      "http://tm4rwkeysv3zz3q5yacyr4rlmca2c4etkdobfvuqzt6vsfsu4weq.b32.i2p",
+      "http://vernzdedoxuflrrxc4vbatbkpjh4k22ecgiqgimdiif62onhagva.b32.i2p"
     ],
     "loki": [
       "http://nitter.priv.loki"
@@ -219,18 +246,11 @@
   },
   "bibliogram": {
     "normal": [
-      "https://bibliogram.art",
-      "https://bibliogram.snopyta.org",
-      "https://bibliogram.pussthecat.org",
       "https://bibliogram.1d4.us",
       "https://bibliogram.froth.zone",
-      "https://insta.trom.tf",
-      "https://insta.tromdienste.de",
       "https://ig.tokhmi.xyz",
       "https://ig.beparanoid.de",
-      "https://bibliogram.priv.pw",
-      "https://ig.funami.tech",
-      "https://bib.actionsack.com"
+      "https://bibliogram.priv.pw"
     ],
     "tor": [],
     "i2p": [],
@@ -346,14 +366,23 @@
       "https://teddit.tokhmi.xyz",
       "https://teddit.garudalinux.org",
       "https://tedd.it",
-      "https://wiki.privacytools.io"
+      "https://wiki.privacytools.io",
+      "https://td.vern.cc",
+      "https://teddit.rawbit.ninja",
+      "https://teddit.artemislena.eu",
+      "https://teddit.manasiwibi.com"
     ],
     "tor": [
       "http://snoo.ioensistjs7wd746zluwixvojbbkxhr37lepdvwtdfeav673o64iflqd.onion",
       "http://ibarajztopxnuhabfu7fg6gbudynxofbnmvis3ltj6lfx47b6fhrd5qd.onion",
       "http://tedditfyn6idalzso5wam5qd3kdtxoljjhbrbbx34q2xkcisvshuytad.onion",
       "http://dawtyi5e2cfyfmoht4izmczi42aa2zwh6wi34zwvc6rzf2acpxhrcrad.onion",
-      "http://qtpvyiaqhmwccxwzsqubd23xhmmrt75tdyw35kp43w4hvamsgl3x27ad.onion"
+      "http://qtpvyiaqhmwccxwzsqubd23xhmmrt75tdyw35kp43w4hvamsgl3x27ad.onion",
+      "http://jnuonmf2n36sfdmyksqqqyab3w63cq4kx24olyjleh5z6zzfvyt7uqqd.onion",
+      "http://td.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
+      "http://yqu4yj5lju7bmlwpzpmltb5gsu6cw7nnbcxxx4iqemwa56nxjiggf4qd.onion",
+      "http://teddit.lpoaj7z2zkajuhgnlltpeqh3zyq7wk2iyeggqaduhgxhyajtdt2j7wad.onion",
+      "http://24fympskbrdgbf4afuvhqwwl2tv3y2vwxg5t2ktozd4j5b3fob5ntzyd.onion"
     ],
     "i2p": [],
     "loki": []
@@ -371,14 +400,17 @@
       "https://wiki.slipfox.xyz",
       "https://wikiless.funami.tech",
       "https://wl.vern.cc",
-      "https://wiki.privacytools.io"
+      "https://wiki.privacytools.io",
+      "https://wikiless.rawbit.ninja",
+      "https://wiki.adminforge.de"
     ],
     "tor": [
       "http://dj2tbh2nqfxyfmvq33cjmhuw7nb6am7thzd3zsjvizeqf374fixbrxyd.onion",
       "http://ybgg2evrcdz37y2qes23ff3wjqjdn33tthgoagi76vhxytu4mpxiz5qd.onion",
-      "http://wikiless.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
+      "http://wikiless.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://c2pesewpalbi6lbfc5hf53q4g3ovnxe4s7tfa6k2aqkf7jd7a7dlz5ad.onion",
-      "http://wl.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
+      "http://wl.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
+      "http://tdx37ew3oke5rxn3yi5r5665ka7ozvehnd4xmnjxxdvqorias2nyl4qd.onion"
     ],
     "i2p": [
       "http://wikiless.i2p",
@@ -395,7 +427,10 @@
       "https://scribe.citizen4.eu",
       "https://scribe.bus-hit.me",
       "https://scribe.froth.zone",
-      "https://scribe.esmailelbob.xyz"
+      "https://scribe.esmailelbob.xyz",
+      "https://scribe.privacydev.net",
+      "https://scribe.rawbit.ninja",
+      "https://sc.vern.cc"
     ],
     "tor": [],
     "i2p": [],
@@ -403,17 +438,19 @@
   },
   "quetre": {
     "normal": [
-      "https://quetre.herokuapp.com",
-      "https://quora.vern.cc",
+      "https://quetre.iket.me",
+      "https://qr.vern.cc",
       "https://quetre.pussthecat.org",
       "https://wuetre.herokuapp.com",
       "https://quetreus.herokuapp.com",
       "https://quetre.tokhmi.xyz",
       "https://quetre.projectsegfau.lt",
-      "https://quetre.esmailelbob.xyz"
+      "https://quetre.esmailelbob.xyz",
+      "https://quetre.odyssey346.dev"
     ],
     "tor": [
-      "http://quetre.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion"
+      "http://quetre.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
+      "http://qr.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
     ],
     "i2p": [],
     "loki": []
@@ -439,7 +476,7 @@
       "https://translate.josias.dev",
       "https://translate.namazso.eu",
       "https://translate.riverside.rocks",
-      "https://st.manerakai.com",
+      "https://simplytranslate.manerakai.com",
       "https://translate.bus-hit.me",
       "https://simplytranslate.pussthecat.org",
       "https://translate.northboot.xyz",
@@ -449,16 +486,19 @@
       "https://translate.slipfox.xyz",
       "https://st.privacydev.net",
       "https://translate.beparanoid.de",
-      "https://translate.priv.pw"
+      "https://translate.priv.pw",
+      "https://st.odyssey346.dev"
     ],
     "tor": [
       "http://fyng2tsmzmvxmojzbbwmfnsn2lrcyftf4cw6rk5j2v2huliazud3fjid.onion",
       "http://xxtbwyb5z5bdvy2f6l2yquu5qilgkjeewno4qfknvb3lkg3nmoklitid.onion",
       "http://translate.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion",
-      "http://simplytranslate.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion"
+      "http://simplytranslate.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
+      "http://tl.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
     ],
     "i2p": [
-      "http://kmnkkp4v4ublygtnyq46oacy3qw75nrxxniriuaersumw7bfsm2a.b32.i2p"
+      "http://kmnkkp4v4ublygtnyq46oacy3qw75nrxxniriuaersumw7bfsm2a.b32.i2p",
+      "http://verna7avzgd4qqal7k2onjzwxcceqby2gwvya2a2frdswb7z2k4q.b32.i2p"
     ],
     "loki": [
       "http://translate.priv.loki"
@@ -482,7 +522,6 @@
   },
   "searx": {
     "normal": [
-      "https://anon.sx",
       "https://dynabyte.ca",
       "https://jsearch.pw",
       "https://search.ethibox.fr",
@@ -499,7 +538,6 @@
       "https://searx.nakhan.net",
       "https://searx.netzspielplatz.de",
       "https://searx.nixnet.services",
-      "https://searx.org",
       "https://searx.ru",
       "https://searx.run",
       "https://searx.semipvt.com",
@@ -522,11 +560,11 @@
     ],
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
-      "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
-      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
+      "http://searxfilowxokbogygrigir4wqxfxqzuxofxgdon7dg6rsii4yxzytyd.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -539,8 +577,11 @@
       "https://darmarit.org/searx",
       "https://de.xcxc.ml",
       "https://etsi.me",
+      "https://icanfindit.online",
       "https://jackgoss.xyz",
+      "https://metasearch.nl",
       "https://northboot.xyz",
+      "https://notsearch.uk",
       "https://opnxng.com",
       "https://paulgo.io",
       "https://priv.au",
@@ -552,18 +593,25 @@
       "https://search.affusio.com",
       "https://search.bus-hit.me",
       "https://search.chemicals-in-the-water.eu",
+      "https://search.cronobox.one",
       "https://search.disroot.org",
       "https://search.gcomm.ch",
       "https://search.kiwitalk.de",
       "https://search.mdosch.de",
+      "https://search.mpx.wtf",
       "https://search.neet.works",
       "https://search.ononoki.org",
       "https://search.privacyguides.net",
       "https://search.projectsegfau.lt",
       "https://search.rabbit-company.com",
+      "https://search.rhscze.cf",
+      "https://search.rowie.at",
       "https://search.sapti.me",
+      "https://search.serginho.dev",
+      "https://search.smnz.de",
       "https://search.teamriverbubbles.com",
       "https://search.unlocked.link",
+      "https://search.uspersec.com",
       "https://search.vidhukant.xyz",
       "https://search.zzls.xyz",
       "https://searx.baczek.me",
@@ -580,6 +628,7 @@
       "https://searx.mha.fi",
       "https://searx.mistli.net",
       "https://searx.namejeff.xyz",
+      "https://searx.org",
       "https://searx.orion-hub.fr",
       "https://searx.priv.pw",
       "https://searx.prvcy.eu",
@@ -588,36 +637,35 @@
       "https://searx.sev.monster",
       "https://searx.slipfox.xyz/searx",
       "https://searx.tiekoetter.com",
-      "https://searx.vimproved.me",
       "https://searx.zcyph.cc",
-      "https://searxng.au/searx",
-      "https://searxng.tordenskjold.de",
+      "https://searxng.nicfab.it",
       "https://searxng.zackptg5.com",
-      "https://searxvm.com",
       "https://serx.ml",
       "https://sh0.it",
       "https://soek.allesbeste.com",
       "https://srx.cosmohub.io",
       "https://swag.pw",
+      "https://trydex.tk/searxng",
       "https://www.gruble.de",
-      "https://www.higgssearch.com",
       "https://www.webrats.xyz",
-      "https://xcxc.ml",
       "https://xo.wtf"
     ],
     "tor": [
       "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
+      "http://privateoz3u5utrimal2edr56j3r5caakektxxgixigdkycuxigvquid.onion",
       "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
-      "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
+      "http://searxngg6zleq6ceboe5ltkyo4hyrb3aaycrgzmrljv3jjlb5vcytead.onion",
+      "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
-      "http://searx.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
+      "http://searx.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
       "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
       "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
-      "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion"
+      "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion",
+      "http://lgmekfnpealdqhnctyg3p5fuelpdwnbqbwnl2ickpdoodzatzgz27ryd.onion"
     ],
     "i2p": [],
     "loki": []
@@ -648,15 +696,16 @@
       "https://librex.extravi.dev",
       "https://search.davidovski.xyz",
       "https://search.funami.tech",
-      "https://librex.catalyst.sx"
+      "https://librex.catalyst.sx",
+      "https://search.madreyk.xyz",
+      "https://search.pabloferreiro.es"
     ],
     "tor": [
-      "http://librex.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion",
+      "http://librex.2356uhnbpv5nk3bni5bv6jg2cd6lgj664kwx3lhyelstpttpyv4kk2qd.onion",
       "http://ncblhz7q4sfbf755bdbhebfzxcpypz7ewafgi4agatecojz7pln4i3id.onion",
       "http://librex.so2mpiyfo4cje7bof5v52y3cvjyo2haxpqfvut4sr6gj2ul4mddx2jid.onion"
     ],
     "i2p": [
-      "http://ljluyti43556bflsucfkhegelemo6guchmq4g7ebxuentomupxoa.b32.i2p",
       "http://rra33hiaf6nmby7jfpqe2gqmng3jnzkvbu2n7jgce7vbhoyuhzya.b32.i2p"
     ],
     "loki": []
@@ -668,7 +717,6 @@
       "https://rimgo.totaldarkness.net",
       "https://rimgo.bus-hit.me",
       "https://rimgo.esmailelbob.xyz",
-      "https://rimgo.lunar.icu",
       "https://i.actionsack.com",
       "https://rimgo.privacydev.net",
       "https://imgur.artemislena.eu",
@@ -677,7 +725,7 @@
       "https://rimgo.mha.fi"
     ],
     "tor": [
-      "http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
+      "http://rimgo.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
       "http://rimgo.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
     ],
@@ -692,12 +740,17 @@
       "https://lbry.projectsegfau.lt",
       "https://librarian.esmailelbob.xyz",
       "https://lbry.vern.cc",
-      "https://lbry.slipfox.xyz"
+      "https://lbry.slipfox.xyz",
+      "https://lbry.sytes.net",
+      "https://lbry.webhop.me",
+      "https://lbry.mywire.org"
     ],
     "tor": [
-      "http://librarian.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
+      "http://librarian.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://lbry.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
-      "http://5znbzx2xcymhddzekfjib3isgqq4ilcyxa2bsq6vqmnvbtgu4f776lqd.onion"
+      "http://5znbzx2xcymhddzekfjib3isgqq4ilcyxa2bsq6vqmnvbtgu4f776lqd.onion",
+      "http://zjmls4urccc5wxc64ilbv4oqarjab6pbanvmhd2qqt6p7fgqrjjnryqd.onion",
+      "http://bxewpsswttslepw27w2hhxhlizwm7l7y54x3jw5cfrb64hb6lgc557ad.onion"
     ],
     "i2p": [],
     "loki": []
@@ -715,7 +768,9 @@
       "https://beatbump.ml",
       "https://beatbump.esmailelbob.xyz"
     ],
-    "tor": [],
+    "tor": [
+      "http://beatbump.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion"
+    ],
     "i2p": [],
     "loki": []
   },
@@ -726,7 +781,7 @@
       "https://listen.whatever.social"
     ],
     "tor": [
-      "http://hyperpipe.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion"
+      "http://hyperpipe.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion"
     ],
     "i2p": [],
     "loki": []
@@ -743,14 +798,27 @@
     "normal": [
       "https://tube.simple-web.org",
       "https://simpleertube.esmailelbob.xyz",
-      "https://stube.tokhmi.xyz"
+      "https://stube.tokhmi.xyz",
+      "https://st.vern.cc"
     ],
     "tor": [],
     "i2p": [],
     "loki": []
   },
   "peertube": [
-    "https://jzqk.org",
+    "https://peertube.tni-hosted.nl",
+    "https://videos.parleur.net",
+    "https://tube.azadehafzar.ir",
+    "https://pewflix.com",
+    "https://video.electronicping.net",
+    "https://videos.im.allmendenetz.de",
+    "https://tube.cyberia.club",
+    "https://casstream.nohost.me",
+    "https://peertube.as62430.net",
+    "https://peertube.askan.info",
+    "https://apertatube.net",
+    "https://beetoons.tv",
+    "https://rankett.net",
     "https://tube.xsoftware.it",
     "https://video.ut0pia.org",
     "https://kinotu.be",
@@ -758,23 +826,17 @@
     "https://www.neptube.io",
     "https://tube.ghk-academy.info",
     "https://pcbu.nl",
-    "https://soberania.tv",
     "https://pire.artisanlogiciel.net",
     "https://tube-test.apps.education.fr",
     "https://tube-sciences-technologies.apps.education.fr",
-    "https://stream.conesphere.cloud",
     "https://tube-institutionnel.apps.education.fr",
     "https://trutube.online",
     "https://tube-cycle-3.apps.education.fr",
     "https://video.manicphase.me",
     "https://tube.emy.plus",
     "https://tubulus.openlatin.org",
-    "https://peertube.securetown.top",
-    "https://tv.datamol.org",
     "https://video.graine-pdl.org",
     "https://tube-cycle-2.apps.education.fr",
-    "https://mikeclips.net",
-    "https://tube.s1gm4.eu",
     "https://videos.keyedlimepie.org",
     "https://video.davduf.net",
     "https://tube.oldkid.digital",
@@ -786,8 +848,6 @@
     "https://media.theplattform.net",
     "https://peertube.offerman.com",
     "https://v.lastorder.xyz",
-    "https://peertube.thele.me",
-    "https://video.schnitzler.one",
     "https://tube.cybershock.life",
     "https://tube.reseau-canope.fr",
     "https://frentube.myyouniverse.observer",
@@ -797,15 +857,12 @@
     "https://video.trankil.info",
     "https://video.uriopss-pdl.fr",
     "https://pt.bolapara.mywire.org",
-    "https://ptube.ranranhome.info",
     "https://video.3cmr.fr",
-    "https://tube.die-rote-front.de",
     "https://peertube.miguelcr.me",
     "https://video.thinkof.name",
     "https://nekofans.tv",
     "https://video.comun.al",
     "https://video.occm.cc",
-    "https://peertube.viviers-fibre.net",
     "https://tube-action-educative.apps.education.fr",
     "https://jahve.pl",
     "https://videos.yesil.club",
@@ -820,49 +877,38 @@
     "https://t.0x0.st",
     "https://tube-education-physique-et-sportive.apps.education.fr",
     "https://videos.lemouvementassociatif-pdl.org",
-    "https://videos.casually.cat",
     "https://playroom.kitsunes.world",
     "https://tube2.nous.media",
-    "https://peertube.freenet.ru",
     "https://peertube.0x5e.eu",
     "https://tube.darknight-coffee.org",
     "https://play.mittdata.se",
-    "https://peertube.lhc.net.br",
-    "https://see.vtopia.live",
     "https://peertube.letoine.fr",
     "https://tube-enseignement-professionnel.apps.education.fr",
     "https://videos.laliguepaysdelaloire.org",
     "https://quantube.win",
     "https://twctube.twc-zone.eu",
     "https://vhs.absturztau.be",
-    "https://video.espr.moe",
     "https://peertube.social.my-wan.de",
     "https://phijkchu.com",
     "https://video.lycee-experimental.org",
-    "https://galileo.news",
     "https://tube.motuhake.xyz",
     "https://pt.m0r016.net",
     "https://hitchtube.fr",
     "https://video.fox-romka.ru",
     "https://peertube.ctrl-c.liu.se",
-    "https://peertube.live",
     "https://video.slipfox.xyz",
     "https://vnop.org",
     "https://videos.cassidypunchmachine.com",
-    "https://tv1.gomntu.space",
     "https://dalek.zone",
     "https://seka.pona.la",
     "https://syop.tv",
     "https://watch.thelema.social",
     "https://tube.miegl.cz",
     "https://mov.clov.fr",
-    "https://videomensoif.ynh.fr",
-    "https://videos.neongarden.life",
     "https://video.vaku.org.ua",
     "https://videos.trom.lt",
     "https://vid.mkp.ca",
     "https://jupiter.tube",
-    "https://tuvideo.encanarias.info",
     "https://videos.squat.net",
     "https://peertube.chaunchy.com",
     "https://tube.vrpnet.org",
@@ -870,32 +916,23 @@
     "https://nightshift.minnix.dev",
     "https://tube.friloux.me",
     "https://peertube.virtual-assembly.org",
-    "https://video.olos311.org",
     "https://peertube.atilla.org",
-    "https://video.lapineige.fr",
-    "https://zapping.no-ip.info",
     "https://tube.azkware.net",
     "https://video.lunasqu.ee",
     "https://v.mkp.ca",
     "https://peertube.eus",
     "https://infothema.net",
     "https://tube.nilsu.org",
-    "https://podlibre.video",
-    "https://videos.tankernn.eu",
     "https://watch.autonomous-zone.earth",
     "https://pirtube.calut.fr",
     "https://y.melonia.se",
-    "https://peertube.cirkau.art",
-    "https://peertube.2i2l.net",
     "https://videos.martyn.berlin",
     "https://turkum.me",
     "https://video.colibris-outilslibres.org",
-    "https://invoice.peertube.biz",
     "https://peertube.chantierlibre.org",
     "https://video.9wd.eu",
     "https://video.niboe.info",
     "https://peertuibe.fedsinfo.nohost.me",
-    "https://s9.gegenstimme.tv",
     "https://videos.alamaisondulibre.org",
     "https://videos.tormentasolar.win",
     "https://tube.nestor.coop",
@@ -912,12 +949,9 @@
     "https://peertube.bgzashtita.es",
     "https://tube.genb.de",
     "https://cliptube.org",
-    "https://tube.tr4sk.me",
     "https://videos.campdarling.com",
-    "https://www.aktion-nordost.tv",
     "https://tube.rooty.fr",
     "https://tube.dnet.one",
-    "https://peertube.io",
     "https://www.kotikoff.net",
     "https://peertube.nz",
     "https://videos.grafo.zone",
@@ -929,7 +963,6 @@
     "https://peertube.narrativerry.xyz",
     "https://tube.9minuti.it",
     "https://krdtube.org",
-    "https://peertube.elforcer.ru",
     "https://tubocatodico.bida.im",
     "https://torstenwitte.peertube-host.de",
     "https://peertube.hackerfraternity.org",
@@ -948,10 +981,7 @@
     "https://free-streams.com",
     "https://tube.pawelko.net",
     "https://video.livecchi.cloud",
-    "https://anarchy.video",
     "https://peertube.gsugambit.com",
-    "https://media.zat.im",
-    "https://videos.sadx.moe",
     "https://pt.nospy.net",
     "https://yhwh.tube",
     "https://tube.kicou.info",
@@ -962,8 +992,6 @@
     "https://peertube.dsmouse.net",
     "https://ptube.horsentiers.fr",
     "https://video.cnt.social",
-    "https://peertube.okko.io",
-    "https://video.mentality.rip",
     "https://tube.03281.fspfc.org",
     "https://tube.linc.systems",
     "https://peertube.ketchup.noho.st",
@@ -976,29 +1004,23 @@
     "https://truvitv.com",
     "https://pt.ilyamikcoder.com",
     "https://peertube.sensin.eu",
-    "https://sharetube.us",
     "https://video.sadmin.io",
     "https://stream.jurnalfm.md",
-    "https://video.asgardius.company",
     "https://video.publicspaces.net",
     "https://video.eientei.org",
     "https://tv.suwerenni.org",
     "https://tube.revertron.com",
     "https://tube.erzbistum-hamburg.de",
     "https://views.southfox.me",
-    "https://vide.oxel.me",
     "https://video.mttv.it",
     "https://peertube.cloud.nerdraum.de",
     "https://vid.pretok.tv",
     "https://videos.slownewsdayshow.com",
     "https://videos.sarcasmstardust.com",
     "https://videos.factsonthegroundshow.com",
-    "https://video.pe6.eu",
     "https://tv.santic-zombie.ru",
     "https://tube.sleeping.town",
-    "https://tube.globalfrens.com",
     "https://peertube.hacknews.pmdcollab.org",
-    "https://freetubes.nohost.me",
     "https://video.snug.moe",
     "https://video.avant-le-strike.buzz",
     "https://videos.ritimo.org",
@@ -1021,7 +1043,6 @@
     "https://peertube.beardedtek.com",
     "https://creemoseducacioninclusiva.uma.es",
     "https://videos.yeswiki.net",
-    "https://tube.lrk.sh",
     "https://peertube.autogestioncitoyenne.org",
     "https://video.r3s.nrw",
     "https://peertube.semweb.pro",
@@ -1030,7 +1051,6 @@
     "https://peertube.rse43.com",
     "https://vid.lelux.fi",
     "https://v.wolfskaempf.de",
-    "https://peertube.chevro.fr",
     "https://media.econoalchemist.com",
     "https://video.qoto.org",
     "https://peertube.maxweiss.io",
@@ -1039,13 +1059,11 @@
     "https://peertube.swarm.solvingmaz.es",
     "https://film.node9.org",
     "https://peertube.mi-site.net",
-    "https://tube.nowtech.io",
     "https://raptube.antipub.org",
     "https://video.cm-en-transition.fr",
     "https://tube.koweb.fr",
     "https://peertube.genma.fr",
     "https://tv.generallyrubbish.net.au",
-    "https://video.travisshears.xyz",
     "https://videos.codingotaku.com",
     "https://foss.tube",
     "https://peertube.satoshishop.de",
@@ -1054,18 +1072,14 @@
     "https://videos.fsci.in",
     "https://video.dnfi.no",
     "https://peertube.revelin.fr",
-    "https://armstube.com",
     "https://peertube.ti-fr.com",
     "https://video.turbo.chat",
-    "https://tube.toldi.eu",
-    "https://review.peertube.biz",
     "https://peertube.am-networks.fr",
     "https://video.chbmeyer.de",
     "https://video.rs-einrich.de",
     "https://p2ptv.ru",
     "https://peertube.librenet.co.za",
     "https://h3h3.club",
-    "https://watch.snoot.tube",
     "https://tube.freepeople.fr",
     "https://watch.rt4mn.org",
     "https://video.lrose.de",
@@ -1082,7 +1096,6 @@
     "https://video.anartist.org",
     "https://peertube.home.x0r.fr",
     "https://peertube.marud.fr",
-    "https://freetubehub.live",
     "https://mtube.mooo.com",
     "https://skeptube.fr",
     "https://tube.villejuif.fr",
@@ -1127,9 +1140,7 @@
     "https://live.solari.com",
     "https://live.codinglab.ch",
     "https://dud-video.inf.tu-dresden.de",
-    "https://media-test.interior.edu.uy",
     "https://media.interior.edu.uy",
-    "https://phoenixproject.group",
     "https://peertube.sebu77.com",
     "https://www.orion-hub.fr",
     "https://tv.orion-serv.fr",
@@ -1170,7 +1181,6 @@
     "https://tube.nuxnik.com",
     "https://tube.froth.zone",
     "https://peertube.ethibox.fr",
-    "https://www.freetubehub.live",
     "https://tube.communia.org",
     "https://peertube.dragonborn.app",
     "https://ai-tube.ch",
@@ -1182,14 +1192,12 @@
     "https://pocketnetpeertube10.nohost.me",
     "https://tube.io18.top",
     "https://peertube.remerge.net",
-    "https://video.wuatek.is",
     "https://tube.geekyboo.net",
     "https://notretube.asselma.eu",
     "https://canal.facil.services",
     "https://pt.gordons.gen.nz",
     "https://tube.misterbanal.net",
     "https://peertube.fomin.site",
-    "https://peertube.kenjiyon.xyz",
     "https://tube.g1zm0.de",
     "https://video.ellijaymakerspace.org",
     "https://videos.benpro.fr",
@@ -1225,14 +1233,12 @@
     "https://bideoak.argia.eus",
     "https://video.hainry.fr",
     "https://video.gresille.org",
-    "https://peertube.tangentfox.com",
     "https://puffy.tube",
     "https://tube.kher.nl",
     "https://watch.ocaml.org",
     "https://peertube.kleph.eu",
     "https://tube.missbanal.net",
     "https://pityu.flaki.hu",
-    "https://tv.catalpafestival.fr",
     "https://pony.tube",
     "https://peertube.umeahackerspace.se",
     "https://tube.okcinfo.news",
@@ -1252,7 +1258,6 @@
     "https://peertube.scyldings.com",
     "https://gade.o-k-i.net",
     "https://peertube.mobilsicher.de",
-    "https://video.jigmedatse.com",
     "https://video.amiga-ng.org",
     "https://peertube.espace.si",
     "https://videos.supertuxkart.net",
@@ -1266,7 +1271,6 @@
     "https://peertube.w.utnw.de",
     "https://tube.sp-codes.de",
     "https://tube.apolut.net",
-    "https://tube.mfraters.net",
     "https://tube.pyngu.com",
     "https://peertube.troback.com",
     "https://peertube.ucy.de",
@@ -1332,7 +1336,6 @@
     "https://peertube.iriseden.eu",
     "https://video.shitposter.club",
     "https://tv.mattchristiansenmedia.com",
-    "https://tube.hackerscop.org",
     "https://peertube.kx.studio",
     "https://videos.3d-wolf.com",
     "https://tube.octaplex.net",
@@ -1355,7 +1358,6 @@
     "https://tube.frischesicht.de",
     "https://peertube1.zeteo.me",
     "https://conspiracydistillery.com",
-    "https://peertube.chemnitz.freifunk.net",
     "https://hpstube.fr",
     "https://video.blast-info.fr",
     "https://peertube.bubuit.net",
@@ -1429,7 +1431,6 @@
     "https://evangelisch.video",
     "https://tube.anufrij.de",
     "https://videos.mastodont.cat",
-    "https://video.taboulisme.com",
     "https://media.undeadnetwork.de",
     "https://tube.dragonpsi.xyz",
     "https://peertube.nicolastissot.fr",
@@ -1503,11 +1504,9 @@
     "https://video.csc49.fr",
     "https://tube.wolfe.casa",
     "https://video.dresden.network",
-    "https://peertube.zapashcanon.fr",
     "https://40two.tube",
     "https://tube.amic37.fr",
     "https://video.comptoir.net",
-    "https://kino.schuerz.at",
     "https://peertube.tiennot.net",
     "https://tututu.tube",
     "https://tube.picasoft.net",
@@ -1520,14 +1519,12 @@
     "https://videos.testimonia.org",
     "https://video.mass-trespass.uk",
     "https://peertube.cipherbliss.com",
-    "https://peertube.stemy.me",
     "https://daschauher.aksel.rocks",
     "https://tube.cyano.at",
     "https://tube.nox-rhea.org",
     "https://peertube.securitymadein.lu",
     "https://tube.rita.moe",
     "https://tuktube.com",
-    "https://v.basspistol.org",
     "https://mytube.kn-cloud.de",
     "https://tube.nuagelibre.fr",
     "https://video.nogafam.es",
@@ -1546,9 +1543,7 @@
     "https://cinema.yunohost.support",
     "https://peertube.s2s.video",
     "https://peertube.travelpandas.eu",
-    "https://video.sdm-tools.net",
     "https://peertube.anzui.dev",
-    "https://video.up.edu.ph",
     "https://video.igem.org",
     "https://worldofvids.com",
     "https://peertube.underworld.fr",
@@ -1575,8 +1570,6 @@
     "https://video.violoncello.ch",
     "https://peertube.gidikroon.eu",
     "https://tubedu.org",
-    "https://watch.breadtube.tv",
-    "https://video.exodus-privacy.eu.org",
     "https://tilvids.com",
     "https://peertube.devloprog.org",
     "https://peertube.designersethiques.org",
-- 
cgit 1.4.1


From b2b9adfa97adc2d3784f5d76f670b919bb6a64fe Mon Sep 17 00:00:00 2001
From: Hygna <hygna@proton.me>
Date: Tue, 20 Sep 2022 22:27:56 +0100
Subject: Update instances to match new structure

---
 src/instances/blacklist.json |  58 ++++--
 src/instances/data.json      | 430 +++++++++++++++++++++----------------------
 2 files changed, 252 insertions(+), 236 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index e7756f8e..fe941df0 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -1,29 +1,36 @@
 {
   "cloudflare": [
     "https://invidious.kavin.rocks",
+    "https://invidious.rhyshl.live",
     "https://piped.kavin.rocks",
     "https://piped.tokhmi.xyz",
     "https://piped.moomoo.me",
     "https://piped.mha.fi",
     "https://de-piped.shimul.me",
     "https://pipedus.palash.dev",
-    "https://piped.waffle.wiki",
     "https://watch.whatever.social",
+    "https://piped.garudalinux.org",
+    "https://y.rivo.lol",
+    "https://cringe.whatever.social",
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
+    "https://nitter.it",
     "https://notabird.site",
     "https://fuckthesacklers.network",
     "https://nitter.winscloud.net",
     "https://twtr.bch.bar",
     "https://twitter.dr460nf1r3.org",
     "https://nitter.garudalinux.org",
-    "https://nitter.wef.lol",
     "https://nitter.catalyst.sx",
     "https://nitter.fprivacy.com",
-    "https://bib.actionsack.com",
+    "https://read.whatever.social",
+    "https://nitter.rawbit.ninja",
+    "https://nitter.privacytools.io",
+    "https://nitter.sneed.network",
+    "https://n.sneed.network",
+    "https://nitter.twei.space",
     "https://libreddit.domain.glass",
     "https://r.nf",
-    "https://lr.oversold.host",
     "https://libreddit.hu",
     "https://lr.stilic.ml",
     "https://reddi.tk",
@@ -32,6 +39,7 @@
     "https://libreddit.winscloud.net",
     "https://r.ahwx.org",
     "https://reddit.dr460nf1r3.org",
+    "https://libreddit.mha.fi",
     "https://libreddit.encrypted-data.xyz",
     "https://libreddit.eu.org",
     "https://teddit.domain.glass",
@@ -39,44 +47,54 @@
     "https://teddit.encrypted-data.xyz",
     "https://teddit.garudalinux.org",
     "https://tedd.it",
+    "https://wiki.privacytools.io",
+    "https://teddit.rawbit.ninja",
     "https://wiki.604kph.xyz",
+    "https://wiki.privacytools.io",
+    "https://wikiless.rawbit.ninja",
+    "https://scribe.rawbit.ninja",
     "https://lingva.garudalinux.org",
     "https://translate.dr460nf1r3.org",
-    "https://searx.org",
     "https://searx.run",
-    "https://search.albony.xyz",
+    "https://searx.org",
     "https://search.garudalinux.org",
     "https://search.dr460nf1r3.org",
     "https://search.wef.lol",
     "https://i.actionsack.com",
     "https://rimgo.encrypted-data.xyz",
-    "https://beatbump.ml"
+    "https://beatbump.ml",
+    "https://listen.whatever.social"
   ],
   "authenticate": [
     "https://nitter:nitter@nitter.nixnet.services"
   ],
   "offline": [
-    "https://invidious.snopyta.org",
-    "https://tok.habedieeh.re",
-    "https://n.hyperborea.cloud",
-    "https://nitter.spaceint.fr",
-    "https://bibliogram.snopyta.org",
-    "https://libreddit.autarkic.org",
+    "https://invidious.rhyshl.live",
+    "https://proxitok.odyssey346.dev",
+    "https://nhanh.cloud",
+    "https://nitter.nl",
+    "https://ntr.odyssey346.dev",
+    "https://libreddit.nl",
     "https://libreddit.notyourcomputer.net",
-    "https://anon.sx",
+    "https://teddit.ggc-project.de",
+    "https://teddit.nautolan.racing",
+    "https://tedd.it",
+    "https://teddit.artemislena.eu",
+    "https://wiki.froth.zone",
+    "https://quetre.odyssey346.dev",
+    "https://st.odyssey346.dev",
     "https://jsearch.pw",
     "https://searx.gnu.style",
     "https://searx.semipvt.com",
     "https://etsi.me",
-    "https://s.zhaocloud.net",
-    "https://search.vidhukant.xyz",
+    "https://search.zzls.xyz",
     "https://searx.ericaftereric.top",
     "https://searx.fmac.xyz",
-    "https://searxng.au/searx",
     "https://www.webrats.xyz",
-    "https://search.albony.xyz",
     "https://whoogle.esmailelbob.xyz",
-    "https://beatbump.ml",
-    "https://stube.tokhmi.xyz"
+    "https://search.wef.lol",
+    "https://i.bcow.xyz",
+    "https://lbry.bcow.xyz",
+    "https://beatbump.ml"
   ]
 }
\ No newline at end of file
diff --git a/src/instances/data.json b/src/instances/data.json
index 3e82842c..e2e5d9f5 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -1,75 +1,82 @@
 {
   "invidious": {
-    "normal": [
+    "clearnet": [
       "https://yewtu.be",
       "https://vid.puffyan.us",
+      "https://invidious.snopyta.org",
       "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
-      "https://invidious.osi.kr",
+      "https://invidio.xamh.de",
       "https://y.com.sb",
       "https://yt.artemislena.eu",
-      "https://invidious.flokinet.to",
       "https://invidious.sethforprivacy.com",
+      "https://invidious.flokinet.to",
       "https://invidious.tiekoetter.com",
       "https://inv.bp.projectsegfau.lt",
-      "https://invidious.projectsegfau.lt",
       "https://inv.vern.cc",
+      "https://invidious.projectsegfau.lt",
       "https://invidious.nerdvpn.de",
+      "https://invidious.rhyshl.live",
       "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
-      "https://youtube.076.ne.jp",
       "https://invidious.weblibre.org",
-      "https://invidious.snopyta.org",
       "https://invidious.esmailelbob.xyz",
+      "https://youtube.076.ne.jp",
       "https://invidious.namazso.eu"
     ],
     "tor": [
-      "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
-      "http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion",
-      "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion",
-      "http://grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad.onion",
-      "http://osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion",
-      "http://u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad.onion",
-      "http://euxxcnhsynwmfidvhjf6uzptsmh4dipkmgdmcmxxuo7tunp3ad2jrwyd.onion",
+      "http://inv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
       "http://invidious.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
-      "http://inv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
+      "http://euxxcnhsynwmfidvhjf6uzptsmh4dipkmgdmcmxxuo7tunp3ad2jrwyd.onion",
+      "http://u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad.onion",
+      "http://osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion",
+      "http://grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad.onion",
+      "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion",
+      "http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion",
+      "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
+      "http://am74vkcrjp2d5v36lcdqgsj2m6x36tbrkhsruoegwfcizzabnfgf5zyd.onion"
     ],
     "i2p": [],
     "loki": []
   },
   "piped": {
-    "normal": [
+    "clearnet": [
       "https://piped.kavin.rocks",
       "https://piped.tokhmi.xyz",
       "https://piped.moomoo.me",
-      "https://il.ax",
       "https://piped.mha.fi",
       "https://de-piped.shimul.me",
       "https://pipedus.palash.dev",
-      "https://piped.waffle.wiki",
       "https://watch.whatever.social",
+      "https://piped.garudalinux.org",
+      "https://y.rivo.lol",
       "https://yt.jae.fi",
       "https://piped.mint.lgbt",
+      "https://il.ax",
+      "https://piped.privacy.com.de",
       "https://piped.esmailelbob.xyz",
-      "https://piped.projectsegfau.lt"
+      "https://piped.projectsegfau.lt",
+      "https://piped.privacydev.net",
+      "https://piped.palveluntarjoaja.eu",
+      "https://piped.smnz.de",
+      "https://piped.adminforge.de",
+      "https://watch.whatevertinfoil.de"
     ],
     "tor": [],
     "i2p": [],
     "loki": []
   },
   "pipedMaterial": {
-    "normal": [
+    "clearnet": [
       "https://piped-material.১.net",
-      "https://piped-material.ftp.sh",
-      "https://piped-staging.ftp.sh",
-      "https://ui.piped.১.net"
+      "https://piped-material.ftp.sh"
     ],
     "tor": [],
     "i2p": [],
     "loki": []
   },
   "cloudtube": {
-    "normal": [
+    "clearnet": [
       "https://tube.cadence.moe",
       "https://yt.beparanoid.de"
     ],
@@ -80,18 +87,25 @@
     "loki": []
   },
   "proxiTok": {
-    "normal": [
-      "https://proxitok.herokuapp.com",
+    "clearnet": [
+      "https://proxitok.pabloferreiro.es",
       "https://proxitok.pussthecat.org",
+      "https://tok.habedieeh.re",
+      "https://proxitok.esmailelbob.xyz",
+      "https://cringe.whatever.social",
+      "https://proxitok.dhusch.de",
       "https://proxitok.privacydev.net",
-      "https://tok.habedieeh.re"
+      "https://proxitok.odyssey346.dev",
+      "https://tok.artemislena.eu",
+      "https://tok.adminforge.de",
+      "https://proxitok.manasiwibi.com"
     ],
     "tor": [],
     "i2p": [],
     "loki": []
   },
   "send": {
-    "normal": [
+    "clearnet": [
       "https://send.vis.ee",
       "https://send.zcyph.cc",
       "https://send.turingpoint.de",
@@ -115,7 +129,7 @@
     "loki": []
   },
   "nitter": {
-    "normal": [
+    "clearnet": [
       "https://nitter.net",
       "https://nitter.42l.fr",
       "https://nitter.pussthecat.org",
@@ -133,7 +147,6 @@
       "https://nitter.it",
       "https://twitter.censors.us",
       "https://nitter.grimneko.de",
-      "https://n.hyperborea.cloud",
       "https://nitter.ca",
       "https://twitter.076.ne.jp",
       "https://nitter.fly.dev",
@@ -148,14 +161,11 @@
       "https://fuckthesacklers.network",
       "https://nitter.esmailelbob.xyz",
       "https://tw.artemislena.eu",
-      "https://de.nttr.stream",
       "https://nitter.winscloud.net",
       "https://nitter.tiekoetter.com",
       "https://nitter.spaceint.fr",
       "https://twtr.bch.bar",
       "https://nitter.privacy.com.de",
-      "https://nitter.mastodon.pro",
-      "https://nitter.notraxx.ch",
       "https://nitter.poast.org",
       "https://nitter.bird.froth.zone",
       "https://nitter.dcs0.hu",
@@ -165,13 +175,11 @@
       "https://n.ramle.be",
       "https://nitter.cz",
       "https://nitter.privacydev.net",
+      "https://nitter.evil.site",
       "https://tweet.lambda.dance",
-      "https://nitter.ebnar.xyz",
       "https://nitter.kylrth.com",
       "https://nitter.foss.wtf",
       "https://nitter.priv.pw",
-      "https://nt.vern.cc",
-      "https://nitter.wef.lol",
       "https://nitter.tokhmi.xyz",
       "https://nitter.catalyst.sx",
       "https://unofficialbird.com",
@@ -184,7 +192,21 @@
       "https://nederland.unofficialbird.com",
       "https://uk.unofficialbird.com",
       "https://n.l5.ca",
-      "https://nitter.slipfox.xyz"
+      "https://nitter.slipfox.xyz",
+      "https://nitter.soopy.moe",
+      "https://nitter.qwik.space",
+      "https://read.whatever.social",
+      "https://nitter.rawbit.ninja",
+      "https://nt.vern.cc",
+      "https://ntr.odyssey346.dev",
+      "https://nitter.ir",
+      "https://nitter.privacytools.io",
+      "https://nitter.sneed.network",
+      "https://n.sneed.network",
+      "https://nitter.manasiwibi.com",
+      "https://nitter.smnz.de",
+      "https://nitter.twei.space",
+      "https://nitter.inpt.fr"
     ],
     "tor": [
       "http://nitter7bryz3jv7e3uekphigvmoyoem4al3fynerxkj22dmoxoq553qd.onion",
@@ -197,7 +219,7 @@
       "http://jebqj47jgxleaiosfcxfibx2xdahjettuydlxbg64azd4khsxv6kawid.onion",
       "http://nttr2iupbb6fazdpr2rgbooon2tzbbsvvkagkgkwohhodjzj43stxhad.onion",
       "http://nitraeju2mipeziu2wtcrqsxg7h62v5y4eqgwi75uprynkj74gevvuqd.onion",
-      "http://nitter.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
+      "http://nitter.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://ibsboeui2im5o7dxnik3s5yghufumgy5abevtij5nbizequfpu4qi4ad.onion",
       "http://ec5nvbycpfa5k6ro77blxgkyrzbkv7uy6r5cngcbkadtjj2733nm3uyd.onion",
       "http://twitter.ap3jtgssd7qn4vfoa62gi2ijddoblslbeuw5dan3xt7myvqpura5i4qd.onion",
@@ -207,39 +229,36 @@
       "http://nitterqdyumlovt7tjqpdjrluitgmtpa53qq3idlpgoe4kxo7gs3xvad.onion",
       "http://nitter.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://aaaaaxx74hbzeibageieowryhsqvimbdiitfkfe47tvgawkwkjh3coqd.onion",
-      "http://wiio4sgs4247brk7hj6qck2jxnvldwfdbguigc5ivpxrsegnliyfvuqd.onion"
+      "http://wiio4sgs4247brk7hj6qck2jxnvldwfdbguigc5ivpxrsegnliyfvuqd.onion",
+      "http://qwikxx2erhx6qrymued6ox2qkf2yeogjwypqvzoif4fqkljixasr6oid.onion",
+      "http://4g47cxugkohbweao2x66nnxxfoe3k7gdfzxej537nhdbwr522sbjxeqd.onion",
+      "http://tw.lpoaj7z2zkajuhgnlltpeqh3zyq7wk2iyeggqaduhgxhyajtdt2j7wad.onion"
     ],
     "i2p": [
       "http://axd6uavsstsrvstva4mzlzh4ct76rc6zdug3nxdgeitrzczhzf4q.b32.i2p",
       "http://u6ikd6zndl3c4dsdq4mmujpntgeevdk5qzkfb57r4tnfeccrn2qa.b32.i2p",
-      "http://gseczlzmiv23p5vhsktyd7whquq2uy3c5fgkmdohh453qp3daoua.b32.i2p"
+      "http://gseczlzmiv23p5vhsktyd7whquq2uy3c5fgkmdohh453qp3daoua.b32.i2p",
+      "http://tm4rwkeysv3zz3q5yacyr4rlmca2c4etkdobfvuqzt6vsfsu4weq.b32.i2p",
+      "http://vernzdedoxuflrrxc4vbatbkpjh4k22ecgiqgimdiif62onhagva.b32.i2p"
     ],
     "loki": [
       "http://nitter.priv.loki"
     ]
   },
   "bibliogram": {
-    "normal": [
-      "https://bibliogram.art",
-      "https://bibliogram.snopyta.org",
-      "https://bibliogram.pussthecat.org",
+    "clearnet": [
       "https://bibliogram.1d4.us",
       "https://bibliogram.froth.zone",
-      "https://insta.trom.tf",
-      "https://insta.tromdienste.de",
       "https://ig.tokhmi.xyz",
       "https://ig.beparanoid.de",
-      "https://bibliogram.privacydev.net",
-      "https://bibliogram.priv.pw",
-      "https://ig.funami.tech",
-      "https://bib.actionsack.com"
+      "https://bibliogram.priv.pw"
     ],
     "tor": [],
     "i2p": [],
     "loki": []
   },
   "libreddit": {
-    "normal": [
+    "clearnet": [
       "https://libredd.it",
       "https://libreddit.spike.codes",
       "https://libreddit.dothq.co",
@@ -324,7 +343,7 @@
     "loki": []
   },
   "teddit": {
-    "normal": [
+    "clearnet": [
       "https://teddit.net",
       "https://teddit.ggc-project.de",
       "https://teddit.zaggy.nl",
@@ -347,20 +366,35 @@
       "https://i.opnxng.com",
       "https://teddit.tokhmi.xyz",
       "https://teddit.garudalinux.org",
-      "https://tedd.it"
+      "https://tedd.it",
+      "https://wiki.privacytools.io",
+      "https://td.vern.cc",
+      "https://teddit.rawbit.ninja",
+      "https://teddit.artemislena.eu",
+      "https://teddit.manasiwibi.com"
     ],
     "tor": [
       "http://snoo.ioensistjs7wd746zluwixvojbbkxhr37lepdvwtdfeav673o64iflqd.onion",
       "http://ibarajztopxnuhabfu7fg6gbudynxofbnmvis3ltj6lfx47b6fhrd5qd.onion",
       "http://tedditfyn6idalzso5wam5qd3kdtxoljjhbrbbx34q2xkcisvshuytad.onion",
       "http://dawtyi5e2cfyfmoht4izmczi42aa2zwh6wi34zwvc6rzf2acpxhrcrad.onion",
-      "http://qtpvyiaqhmwccxwzsqubd23xhmmrt75tdyw35kp43w4hvamsgl3x27ad.onion"
+      "http://qtpvyiaqhmwccxwzsqubd23xhmmrt75tdyw35kp43w4hvamsgl3x27ad.onion",
+      "http://jnuonmf2n36sfdmyksqqqyab3w63cq4kx24olyjleh5z6zzfvyt7uqqd.onion",
+      "http://td.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
+      "http://yqu4yj5lju7bmlwpzpmltb5gsu6cw7nnbcxxx4iqemwa56nxjiggf4qd.onion",
+      "http://teddit.lpoaj7z2zkajuhgnlltpeqh3zyq7wk2iyeggqaduhgxhyajtdt2j7wad.onion",
+      "http://24fympskbrdgbf4afuvhqwwl2tv3y2vwxg5t2ktozd4j5b3fob5ntzyd.onion"
+    ],
+    "i2p": [
+      "http://xugoqcf2pftm76vbznx4xuhrzyb5b6zwpizpnw2hysexjdn5l2tq.b32.i2p",
+      "http://teddit.i2p",
+      "https://codeberg.org/teddit/teddit/src/branch/main/vzeiwzi7ogwl3ijrfek4fbtwhvamxcpyqoc3s4vcgnhlp54s5clq.b32.i2p",
+      "http://verncco2oaxjikammz4pi7umzp673cme6zuemx7yeeewspwrw3va.b32.i2p"
     ],
-    "i2p": [],
     "loki": []
   },
   "wikiless": {
-    "normal": [
+    "clearnet": [
       "https://wikiless.org",
       "https://wikiless.sethforprivacy.com",
       "https://wiki.604kph.xyz",
@@ -370,69 +404,85 @@
       "https://wikiless.tiekoetter.com",
       "https://wikiless.esmailelbob.xyz",
       "https://wiki.slipfox.xyz",
-      "https://wikiless.funami.tech"
+      "https://wikiless.funami.tech",
+      "https://wl.vern.cc",
+      "https://wiki.privacytools.io",
+      "https://wikiless.rawbit.ninja",
+      "https://wiki.adminforge.de"
     ],
     "tor": [
       "http://dj2tbh2nqfxyfmvq33cjmhuw7nb6am7thzd3zsjvizeqf374fixbrxyd.onion",
       "http://ybgg2evrcdz37y2qes23ff3wjqjdn33tthgoagi76vhxytu4mpxiz5qd.onion",
-      "http://wikiless.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
-      "http://c2pesewpalbi6lbfc5hf53q4g3ovnxe4s7tfa6k2aqkf7jd7a7dlz5ad.onion"
+      "http://wikiless.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
+      "http://c2pesewpalbi6lbfc5hf53q4g3ovnxe4s7tfa6k2aqkf7jd7a7dlz5ad.onion",
+      "http://wl.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
+      "http://tdx37ew3oke5rxn3yi5r5665ka7ozvehnd4xmnjxxdvqorias2nyl4qd.onion"
     ],
     "i2p": [
       "http://wikiless.i2p",
       "http://hflqp2ejxygpj6cdwo3ogfieqmxw3b56w7dblt7bor2ltwk6kcfa.b32.i2p",
-      "http://x33lx4h6d7h6xs4eiqwhvaxn3ea5gn2ifmu3jobnvuvn4k4aej7a.b32.i2p"
+      "http://x33lx4h6d7h6xs4eiqwhvaxn3ea5gn2ifmu3jobnvuvn4k4aej7a.b32.i2p",
+      "http://vernesciy2defjsputrjrv6pa5ll6qzrckfffi5lgkumstdojyga.b32.i2p"
     ],
     "loki": []
   },
   "scribe": {
-    "normal": [
+    "clearnet": [
       "https://scribe.rip",
       "https://scribe.nixnet.services",
       "https://scribe.citizen4.eu",
       "https://scribe.bus-hit.me",
       "https://scribe.froth.zone",
-      "https://scribe.esmailelbob.xyz"
+      "https://scribe.esmailelbob.xyz",
+      "https://scribe.privacydev.net",
+      "https://scribe.rawbit.ninja",
+      "https://sc.vern.cc"
     ],
     "tor": [],
     "i2p": [],
     "loki": []
   },
   "quetre": {
-    "normal": [
-      "https://quetre.herokuapp.com",
-      "https://quora.vern.cc",
+    "clearnet": [
+      "https://quetre.iket.me",
+      "https://qr.vern.cc",
       "https://quetre.pussthecat.org",
       "https://wuetre.herokuapp.com",
       "https://quetreus.herokuapp.com",
       "https://quetre.tokhmi.xyz",
       "https://quetre.projectsegfau.lt",
-      "https://quetre.esmailelbob.xyz"
+      "https://quetre.esmailelbob.xyz",
+      "https://quetre.odyssey346.dev"
+    ],
+    "tor": [
+      "http://quetre.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
+      "http://qr.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
     ],
-    "tor": [],
     "i2p": [],
     "loki": []
   },
   "libremdb": {
-    "normal": [
+    "clearnet": [
       "https://libremdb.herokuapp.com",
       "https://libremdb.pussthecat.org",
       "https://libremdbeu.herokuapp.com",
       "https://lmdb.tokhmi.xyz",
       "https://libremdb.esmailelbob.xyz"
     ],
-    "tor": [],
+    "tor": [
+      "http://libremdb.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion"
+    ],
     "i2p": [],
     "loki": []
   },
   "simplyTranslate": {
-    "normal": [
+    "clearnet": [
       "https://simplytranslate.org",
       "https://st.tokhmi.xyz",
       "https://translate.josias.dev",
       "https://translate.namazso.eu",
       "https://translate.riverside.rocks",
-      "https://st.manerakai.com",
+      "https://simplytranslate.manerakai.com",
       "https://translate.bus-hit.me",
       "https://simplytranslate.pussthecat.org",
       "https://translate.northboot.xyz",
@@ -442,22 +492,26 @@
       "https://translate.slipfox.xyz",
       "https://st.privacydev.net",
       "https://translate.beparanoid.de",
-      "https://translate.priv.pw"
+      "https://translate.priv.pw",
+      "https://st.odyssey346.dev"
     ],
     "tor": [
       "http://fyng2tsmzmvxmojzbbwmfnsn2lrcyftf4cw6rk5j2v2huliazud3fjid.onion",
       "http://xxtbwyb5z5bdvy2f6l2yquu5qilgkjeewno4qfknvb3lkg3nmoklitid.onion",
-      "http://translate.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion"
+      "http://translate.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion",
+      "http://simplytranslate.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
+      "http://tl.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
     ],
     "i2p": [
-      "http://kmnkkp4v4ublygtnyq46oacy3qw75nrxxniriuaersumw7bfsm2a.b32.i2p"
+      "http://kmnkkp4v4ublygtnyq46oacy3qw75nrxxniriuaersumw7bfsm2a.b32.i2p",
+      "http://verna7avzgd4qqal7k2onjzwxcceqby2gwvya2a2frdswb7z2k4q.b32.i2p"
     ],
     "loki": [
       "http://translate.priv.loki"
     ]
   },
   "lingva": {
-    "normal": [
+    "clearnet": [
       "https://lingva.ml",
       "https://translate.igna.ooo",
       "https://lingva.pussthecat.org",
@@ -473,8 +527,7 @@
     "loki": []
   },
   "searx": {
-    "normal": [
-      "https://anon.sx",
+    "clearnet": [
       "https://dynabyte.ca",
       "https://jsearch.pw",
       "https://search.ethibox.fr",
@@ -491,8 +544,6 @@
       "https://searx.nakhan.net",
       "https://searx.netzspielplatz.de",
       "https://searx.nixnet.services",
-      "https://searx.org",
-      "https://searx.rasp.fr",
       "https://searx.ru",
       "https://searx.run",
       "https://searx.semipvt.com",
@@ -515,10 +566,12 @@
     ],
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
+      "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
-      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
+      "http://searxfilowxokbogygrigir4wqxfxqzuxofxgdon7dg6rsii4yxzytyd.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -527,12 +580,15 @@
     "loki": []
   },
   "searxng": {
-    "normal": [
+    "clearnet": [
       "https://darmarit.org/searx",
       "https://de.xcxc.ml",
       "https://etsi.me",
+      "https://icanfindit.online",
       "https://jackgoss.xyz",
+      "https://metasearch.nl",
       "https://northboot.xyz",
+      "https://notsearch.uk",
       "https://opnxng.com",
       "https://paulgo.io",
       "https://priv.au",
@@ -542,24 +598,30 @@
       "https://saber.tk",
       "https://search.0relay.com",
       "https://search.affusio.com",
-      "https://search.ashs.club",
-      "https://search.bingowaves.xyz",
       "https://search.bus-hit.me",
       "https://search.chemicals-in-the-water.eu",
+      "https://search.cronobox.one",
       "https://search.disroot.org",
       "https://search.gcomm.ch",
       "https://search.kiwitalk.de",
       "https://search.mdosch.de",
+      "https://search.mpx.wtf",
       "https://search.neet.works",
       "https://search.ononoki.org",
       "https://search.privacyguides.net",
       "https://search.projectsegfau.lt",
       "https://search.rabbit-company.com",
+      "https://search.rhscze.cf",
+      "https://search.rowie.at",
       "https://search.sapti.me",
+      "https://search.serginho.dev",
+      "https://search.smnz.de",
       "https://search.teamriverbubbles.com",
       "https://search.unlocked.link",
+      "https://search.uspersec.com",
       "https://search.vidhukant.xyz",
       "https://search.zzls.xyz",
+      "https://searx.baczek.me",
       "https://searx.be",
       "https://searx.becomesovran.com",
       "https://searx.chocoflan.net",
@@ -569,9 +631,11 @@
       "https://searx.fi",
       "https://searx.fmac.xyz",
       "https://searx.gnous.eu",
+      "https://searx.kujonello.cf",
       "https://searx.mha.fi",
       "https://searx.mistli.net",
       "https://searx.namejeff.xyz",
+      "https://searx.org",
       "https://searx.orion-hub.fr",
       "https://searx.priv.pw",
       "https://searx.prvcy.eu",
@@ -580,40 +644,41 @@
       "https://searx.sev.monster",
       "https://searx.slipfox.xyz/searx",
       "https://searx.tiekoetter.com",
-      "https://searx.vimproved.me",
       "https://searx.zcyph.cc",
-      "https://searxng.au/searx",
-      "https://searxng.tordenskjold.de",
+      "https://searxng.nicfab.it",
       "https://searxng.zackptg5.com",
       "https://serx.ml",
       "https://sh0.it",
+      "https://soek.allesbeste.com",
       "https://srx.cosmohub.io",
       "https://swag.pw",
+      "https://trydex.tk/searxng",
       "https://www.gruble.de",
       "https://www.webrats.xyz",
-      "https://xcxc.ml",
       "https://xo.wtf"
     ],
     "tor": [
       "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
-      "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
+      "http://privateoz3u5utrimal2edr56j3r5caakektxxgixigdkycuxigvquid.onion",
       "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
-      "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
-      "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
+      "http://searxngg6zleq6ceboe5ltkyo4hyrb3aaycrgzmrljv3jjlb5vcytead.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
+      "http://b2c7fvbhnfvwnl6oh2tydhzfx4i37kmmrycq42heqbbe7wovq3uzenid.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
+      "http://searx.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
       "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
       "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
-      "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion"
+      "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion",
+      "https://lgmekfnpealdqhnctyg3p5fuelpdwnbqbwnl2ickpdoodzatzgz27ryd.onion"
     ],
     "i2p": [],
     "loki": []
   },
   "whoogle": {
-    "normal": [
+    "clearnet": [
       "https://gowogle.voring.me",
       "https://s.tokhmi.xyz",
       "https://search.albony.xyz",
@@ -633,29 +698,32 @@
     "loki": []
   },
   "librex": {
-    "normal": [
+    "clearnet": [
       "https://librex.beparanoid.de",
+      "https://librex.extravi.dev",
       "https://search.davidovski.xyz",
       "https://search.funami.tech",
-      "https://librex.catalyst.sx"
+      "https://librex.catalyst.sx",
+      "https://search.madreyk.xyz",
+      "https://search.pabloferreiro.es"
     ],
     "tor": [
-      "http://librex.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion",
+      "http://librex.2356uhnbpv5nk3bni5bv6jg2cd6lgj664kwx3lhyelstpttpyv4kk2qd.onion",
+      "http://ncblhz7q4sfbf755bdbhebfzxcpypz7ewafgi4agatecojz7pln4i3id.onion",
       "http://librex.so2mpiyfo4cje7bof5v52y3cvjyo2haxpqfvut4sr6gj2ul4mddx2jid.onion"
     ],
     "i2p": [
-      "http://fboseyskrqpi6yjiifvz4ryuoiswjezkqsfxfkm2vmbuhehbpr7q.b32.i2p"
+      "http://rra33hiaf6nmby7jfpqe2gqmng3jnzkvbu2n7jgce7vbhoyuhzya.b32.i2p"
     ],
     "loki": []
   },
   "rimgo": {
-    "normal": [
+    "clearnet": [
       "https://i.bcow.xyz",
       "https://rimgo.pussthecat.org",
       "https://rimgo.totaldarkness.net",
       "https://rimgo.bus-hit.me",
       "https://rimgo.esmailelbob.xyz",
-      "https://rimgo.lunar.icu",
       "https://i.actionsack.com",
       "https://rimgo.privacydev.net",
       "https://imgur.artemislena.eu",
@@ -664,7 +732,7 @@
       "https://rimgo.mha.fi"
     ],
     "tor": [
-      "http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
+      "http://rimgo.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
       "http://rimgo.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
     ],
@@ -672,25 +740,30 @@
     "loki": []
   },
   "librarian": {
-    "normal": [
+    "clearnet": [
       "https://lbry.bcow.xyz",
       "https://odysee.076.ne.jp",
       "https://librarian.pussthecat.org",
-      "https://lbry.mutahar.rocks",
+      "https://lbry.projectsegfau.lt",
       "https://librarian.esmailelbob.xyz",
       "https://lbry.vern.cc",
-      "https://lbry.slipfox.xyz"
+      "https://lbry.slipfox.xyz",
+      "https://lbry.sytes.net",
+      "https://lbry.webhop.me",
+      "https://lbry.mywire.org"
     ],
     "tor": [
-      "http://librarian.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
+      "http://librarian.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://lbry.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
-      "http://5znbzx2xcymhddzekfjib3isgqq4ilcyxa2bsq6vqmnvbtgu4f776lqd.onion"
+      "http://5znbzx2xcymhddzekfjib3isgqq4ilcyxa2bsq6vqmnvbtgu4f776lqd.onion",
+      "http://zjmls4urccc5wxc64ilbv4oqarjab6pbanvmhd2qqt6p7fgqrjjnryqd.onion",
+      "http://bxewpsswttslepw27w2hhxhlizwm7l7y54x3jw5cfrb64hb6lgc557ad.onion"
     ],
     "i2p": [],
     "loki": []
   },
   "neuters": {
-    "normal": [
+    "clearnet": [
       "https://neuters.de"
     ],
     "tor": [],
@@ -698,24 +771,31 @@
     "loki": []
   },
   "beatbump": {
-    "normal": [
-      "https://beatbump.ml"
+    "clearnet": [
+      "https://beatbump.ml",
+      "https://beatbump.esmailelbob.xyz"
+    ],
+    "tor": [
+      "http://beatbump.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion"
     ],
-    "tor": [],
     "i2p": [],
     "loki": []
   },
   "hyperpipe": {
-    "normal": [
+    "clearnet": [
       "https://hyperpipe.surge.sh",
-      "https://hyperpipe.esmailelbob.xyz"
+      "https://hyperpipe.esmailelbob.xyz",
+      "https://listen.whatever.social",
+      "https://music.adminforge.de"
+    ],
+    "tor": [
+      "http://hyperpipe.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion"
     ],
-    "tor": [],
     "i2p": [],
     "loki": []
   },
   "facil": {
-    "normal": [
+    "clearnet": [
       "https://facilmap.org"
     ],
     "tor": [],
@@ -723,42 +803,51 @@
     "loki": []
   },
   "simpleertube": {
-    "normal": [
+    "clearnet": [
       "https://tube.simple-web.org",
       "https://simpleertube.esmailelbob.xyz",
-      "https://stube.tokhmi.xyz"
+      "https://stube.tokhmi.xyz",
+      "https://st.vern.cc"
     ],
     "tor": [],
     "i2p": [],
     "loki": []
   },
   "peertube": [
+    "https://pt.freedomwolf.cc",
+    "https://vr360tube.online",
+    "https://bodavr.com",
+    "https://peertube.tni-hosted.nl",
+    "https://videos.parleur.net",
+    "https://tube.azadehafzar.ir",
+    "https://pewflix.com",
+    "https://video.electronicping.net",
+    "https://videos.im.allmendenetz.de",
+    "https://tube.cyberia.club",
+    "https://casstream.nohost.me",
+    "https://peertube.as62430.net",
+    "https://peertube.askan.info",
+    "https://apertatube.net",
+    "https://beetoons.tv",
+    "https://rankett.net",
+    "https://tube.xsoftware.it",
+    "https://video.ut0pia.org",
+    "https://kinotu.be",
     "https://tube.nogafa.org",
     "https://www.neptube.io",
     "https://tube.ghk-academy.info",
     "https://pcbu.nl",
-    "https://soberania.tv",
     "https://pire.artisanlogiciel.net",
-    "https://trutube.xyz",
     "https://tube-test.apps.education.fr",
     "https://tube-sciences-technologies.apps.education.fr",
-    "https://stream.conesphere.cloud",
     "https://tube-institutionnel.apps.education.fr",
     "https://trutube.online",
     "https://tube-cycle-3.apps.education.fr",
     "https://video.manicphase.me",
-    "https://tube.emy.plus",
-    "https://v.bearvideo.win",
     "https://tubulus.openlatin.org",
-    "https://peertube.securetown.top",
-    "https://tv.datamol.org",
     "https://video.graine-pdl.org",
-    "https://tube.zee.li",
     "https://tube-cycle-2.apps.education.fr",
-    "https://mikeclips.net",
-    "https://tube.s1gm4.eu",
     "https://videos.keyedlimepie.org",
-    "https://video.cpn.so",
     "https://video.davduf.net",
     "https://tube.oldkid.digital",
     "https://tube.fofoca.eu",
@@ -769,9 +858,6 @@
     "https://media.theplattform.net",
     "https://peertube.offerman.com",
     "https://v.lastorder.xyz",
-    "https://video.eradicatinglove.xyz",
-    "https://peertube.thele.me",
-    "https://video.schnitzler.one",
     "https://tube.cybershock.life",
     "https://tube.reseau-canope.fr",
     "https://frentube.myyouniverse.observer",
@@ -781,17 +867,12 @@
     "https://video.trankil.info",
     "https://video.uriopss-pdl.fr",
     "https://pt.bolapara.mywire.org",
-    "https://ptube.ranranhome.info",
-    "https://vidid.pl",
     "https://video.3cmr.fr",
-    "https://tube.die-rote-front.de",
     "https://peertube.miguelcr.me",
     "https://video.thinkof.name",
     "https://nekofans.tv",
     "https://video.comun.al",
-    "https://peertube.nrsk.no",
     "https://video.occm.cc",
-    "https://peertube.viviers-fibre.net",
     "https://tube-action-educative.apps.education.fr",
     "https://jahve.pl",
     "https://videos.yesil.club",
@@ -800,93 +881,68 @@
     "https://tube.hunterjozwiak.com",
     "https://tube-numerique-educatif.apps.education.fr",
     "https://tube.itsg.host",
-    "https://tube.valinor.fr",
     "https://lucarne.balsamine.be",
     "https://peertube.suranyami.com",
     "https://video.ados.accoord.fr",
     "https://t.0x0.st",
     "https://tube-education-physique-et-sportive.apps.education.fr",
     "https://videos.lemouvementassociatif-pdl.org",
-    "https://videos.casually.cat",
     "https://playroom.kitsunes.world",
     "https://tube2.nous.media",
-    "https://peertube.freenet.ru",
     "https://peertube.0x5e.eu",
     "https://tube.darknight-coffee.org",
     "https://play.mittdata.se",
-    "https://peertube.lhc.net.br",
-    "https://see.vtopia.live",
     "https://peertube.letoine.fr",
     "https://tube-enseignement-professionnel.apps.education.fr",
-    "https://socpeertube.ru",
     "https://videos.laliguepaysdelaloire.org",
     "https://quantube.win",
     "https://twctube.twc-zone.eu",
     "https://vhs.absturztau.be",
-    "https://video.espr.moe",
     "https://peertube.social.my-wan.de",
     "https://phijkchu.com",
     "https://video.lycee-experimental.org",
-    "https://galileo.news",
-    "https://peertube.otakufarms.com",
     "https://tube.motuhake.xyz",
     "https://pt.m0r016.net",
     "https://hitchtube.fr",
     "https://video.fox-romka.ru",
     "https://peertube.ctrl-c.liu.se",
-    "https://peertube.live",
     "https://video.slipfox.xyz",
-    "https://pt.vern.cc",
     "https://vnop.org",
     "https://videos.cassidypunchmachine.com",
-    "https://tv1.gomntu.space",
     "https://dalek.zone",
     "https://seka.pona.la",
     "https://syop.tv",
     "https://watch.thelema.social",
     "https://tube.miegl.cz",
     "https://mov.clov.fr",
-    "https://videomensoif.ynh.fr",
-    "https://videos.neongarden.life",
     "https://video.vaku.org.ua",
     "https://videos.trom.lt",
     "https://vid.mkp.ca",
     "https://jupiter.tube",
-    "https://tuvideo.encanarias.info",
     "https://videos.squat.net",
     "https://peertube.chaunchy.com",
     "https://tube.vrpnet.org",
     "https://video.tii.space",
-    "https://peertube.inubo.ch",
     "https://nightshift.minnix.dev",
     "https://tube.friloux.me",
     "https://peertube.virtual-assembly.org",
-    "https://video.olos311.org",
     "https://peertube.atilla.org",
-    "https://video.lapineige.fr",
-    "https://zapping.no-ip.info",
     "https://tube.azkware.net",
     "https://video.lunasqu.ee",
     "https://v.mkp.ca",
     "https://peertube.eus",
     "https://infothema.net",
     "https://tube.nilsu.org",
-    "https://podlibre.video",
-    "https://videos.tankernn.eu",
     "https://watch.autonomous-zone.earth",
     "https://pirtube.calut.fr",
     "https://y.melonia.se",
-    "https://peertube.cirkau.art",
-    "https://peertube.2i2l.net",
     "https://videos.martyn.berlin",
     "https://turkum.me",
     "https://video.colibris-outilslibres.org",
-    "https://invoice.peertube.biz",
     "https://peertube.chantierlibre.org",
     "https://video.9wd.eu",
     "https://video.niboe.info",
     "https://peertuibe.fedsinfo.nohost.me",
-    "https://s9.gegenstimme.tv",
     "https://videos.alamaisondulibre.org",
     "https://videos.tormentasolar.win",
     "https://tube.nestor.coop",
@@ -903,13 +959,9 @@
     "https://peertube.bgzashtita.es",
     "https://tube.genb.de",
     "https://cliptube.org",
-    "https://tube.tr4sk.me",
     "https://videos.campdarling.com",
-    "https://video.mikka.md",
-    "https://www.aktion-nordost.tv",
     "https://tube.rooty.fr",
     "https://tube.dnet.one",
-    "https://peertube.io",
     "https://www.kotikoff.net",
     "https://peertube.nz",
     "https://videos.grafo.zone",
@@ -921,7 +973,6 @@
     "https://peertube.narrativerry.xyz",
     "https://tube.9minuti.it",
     "https://krdtube.org",
-    "https://peertube.elforcer.ru",
     "https://tubocatodico.bida.im",
     "https://torstenwitte.peertube-host.de",
     "https://peertube.hackerfraternity.org",
@@ -940,14 +991,9 @@
     "https://free-streams.com",
     "https://tube.pawelko.net",
     "https://video.livecchi.cloud",
-    "https://anarchy.video",
     "https://peertube.gsugambit.com",
-    "https://media.zat.im",
-    "https://videos.sadx.moe",
     "https://pt.nospy.net",
     "https://yhwh.tube",
-    "https://peerlook.ru",
-    "https://monero.wf",
     "https://tube.kicou.info",
     "https://video.aqr.af",
     "https://videos-passages.huma-num.fr",
@@ -956,8 +1002,6 @@
     "https://peertube.dsmouse.net",
     "https://ptube.horsentiers.fr",
     "https://video.cnt.social",
-    "https://peertube.okko.io",
-    "https://video.mentality.rip",
     "https://tube.03281.fspfc.org",
     "https://tube.linc.systems",
     "https://peertube.ketchup.noho.st",
@@ -970,31 +1014,23 @@
     "https://truvitv.com",
     "https://pt.ilyamikcoder.com",
     "https://peertube.sensin.eu",
-    "https://watch.riverside.rocks",
-    "https://sharetube.us",
     "https://video.sadmin.io",
     "https://stream.jurnalfm.md",
-    "https://video.asgardius.company",
     "https://video.publicspaces.net",
     "https://video.eientei.org",
     "https://tv.suwerenni.org",
     "https://tube.revertron.com",
     "https://tube.erzbistum-hamburg.de",
-    "https://video.germanische-heilkunde.at",
     "https://views.southfox.me",
-    "https://vide.oxel.me",
     "https://video.mttv.it",
     "https://peertube.cloud.nerdraum.de",
     "https://vid.pretok.tv",
     "https://videos.slownewsdayshow.com",
     "https://videos.sarcasmstardust.com",
     "https://videos.factsonthegroundshow.com",
-    "https://video.pe6.eu",
     "https://tv.santic-zombie.ru",
     "https://tube.sleeping.town",
-    "https://tube.globalfrens.com",
     "https://peertube.hacknews.pmdcollab.org",
-    "https://freetubes.nohost.me",
     "https://video.snug.moe",
     "https://video.avant-le-strike.buzz",
     "https://videos.ritimo.org",
@@ -1017,17 +1053,14 @@
     "https://peertube.beardedtek.com",
     "https://creemoseducacioninclusiva.uma.es",
     "https://videos.yeswiki.net",
-    "https://tube.lrk.sh",
     "https://peertube.autogestioncitoyenne.org",
     "https://video.r3s.nrw",
     "https://peertube.semweb.pro",
     "https://poast.tv",
     "https://testube.distrilab.fr",
     "https://peertube.rse43.com",
-    "https://libremedia.video",
     "https://vid.lelux.fi",
     "https://v.wolfskaempf.de",
-    "https://peertube.chevro.fr",
     "https://media.econoalchemist.com",
     "https://video.qoto.org",
     "https://peertube.maxweiss.io",
@@ -1036,34 +1069,27 @@
     "https://peertube.swarm.solvingmaz.es",
     "https://film.node9.org",
     "https://peertube.mi-site.net",
-    "https://tube.nowtech.io",
     "https://raptube.antipub.org",
     "https://video.cm-en-transition.fr",
     "https://tube.koweb.fr",
     "https://peertube.genma.fr",
     "https://tv.generallyrubbish.net.au",
-    "https://video.travisshears.xyz",
     "https://videos.codingotaku.com",
     "https://foss.tube",
     "https://peertube.satoshishop.de",
     "https://ua.peertube.red",
     "https://peertube.zwindler.fr",
     "https://videos.fsci.in",
-    "https://swebbtube.se",
     "https://video.dnfi.no",
     "https://peertube.revelin.fr",
-    "https://armstube.com",
     "https://peertube.ti-fr.com",
     "https://video.turbo.chat",
-    "https://tube.toldi.eu",
-    "https://review.peertube.biz",
     "https://peertube.am-networks.fr",
     "https://video.chbmeyer.de",
     "https://video.rs-einrich.de",
     "https://p2ptv.ru",
     "https://peertube.librenet.co.za",
     "https://h3h3.club",
-    "https://watch.snoot.tube",
     "https://tube.freepeople.fr",
     "https://watch.rt4mn.org",
     "https://video.lrose.de",
@@ -1080,7 +1106,6 @@
     "https://video.anartist.org",
     "https://peertube.home.x0r.fr",
     "https://peertube.marud.fr",
-    "https://freetubehub.live",
     "https://mtube.mooo.com",
     "https://skeptube.fr",
     "https://tube.villejuif.fr",
@@ -1125,9 +1150,7 @@
     "https://live.solari.com",
     "https://live.codinglab.ch",
     "https://dud-video.inf.tu-dresden.de",
-    "https://media-test.interior.edu.uy",
     "https://media.interior.edu.uy",
-    "https://phoenixproject.group",
     "https://peertube.sebu77.com",
     "https://www.orion-hub.fr",
     "https://tv.orion-serv.fr",
@@ -1168,7 +1191,6 @@
     "https://tube.nuxnik.com",
     "https://tube.froth.zone",
     "https://peertube.ethibox.fr",
-    "https://www.freetubehub.live",
     "https://tube.communia.org",
     "https://peertube.dragonborn.app",
     "https://ai-tube.ch",
@@ -1180,14 +1202,12 @@
     "https://pocketnetpeertube10.nohost.me",
     "https://tube.io18.top",
     "https://peertube.remerge.net",
-    "https://video.wuatek.is",
     "https://tube.geekyboo.net",
     "https://notretube.asselma.eu",
     "https://canal.facil.services",
     "https://pt.gordons.gen.nz",
     "https://tube.misterbanal.net",
     "https://peertube.fomin.site",
-    "https://peertube.kenjiyon.xyz",
     "https://tube.g1zm0.de",
     "https://video.ellijaymakerspace.org",
     "https://videos.benpro.fr",
@@ -1223,14 +1243,12 @@
     "https://bideoak.argia.eus",
     "https://video.hainry.fr",
     "https://video.gresille.org",
-    "https://peertube.tangentfox.com",
     "https://puffy.tube",
     "https://tube.kher.nl",
     "https://watch.ocaml.org",
     "https://peertube.kleph.eu",
     "https://tube.missbanal.net",
     "https://pityu.flaki.hu",
-    "https://tv.catalpafestival.fr",
     "https://pony.tube",
     "https://peertube.umeahackerspace.se",
     "https://tube.okcinfo.news",
@@ -1250,7 +1268,6 @@
     "https://peertube.scyldings.com",
     "https://gade.o-k-i.net",
     "https://peertube.mobilsicher.de",
-    "https://video.jigmedatse.com",
     "https://video.amiga-ng.org",
     "https://peertube.espace.si",
     "https://videos.supertuxkart.net",
@@ -1264,7 +1281,6 @@
     "https://peertube.w.utnw.de",
     "https://tube.sp-codes.de",
     "https://tube.apolut.net",
-    "https://tube.mfraters.net",
     "https://tube.pyngu.com",
     "https://peertube.troback.com",
     "https://peertube.ucy.de",
@@ -1300,7 +1316,6 @@
     "https://video.gyt.is",
     "https://peertube.jensdiemer.de",
     "https://tube.futuretic.fr",
-    "https://libra.syntazia.org",
     "https://peertube.beeldengeluid.nl",
     "https://tv.lumbung.space",
     "https://peertube.cuatrolibertades.org",
@@ -1318,7 +1333,6 @@
     "https://peertube.radres.xyz",
     "https://darkvapor.nohost.me",
     "https://tube.chaoszone.tv",
-    "https://media.over-world.org",
     "https://tube.avensio.de",
     "https://peertube.klaewyss.fr",
     "https://sender-fm.veezee.tube",
@@ -1332,7 +1346,6 @@
     "https://peertube.iriseden.eu",
     "https://video.shitposter.club",
     "https://tv.mattchristiansenmedia.com",
-    "https://tube.hackerscop.org",
     "https://peertube.kx.studio",
     "https://videos.3d-wolf.com",
     "https://tube.octaplex.net",
@@ -1355,7 +1368,6 @@
     "https://tube.frischesicht.de",
     "https://peertube1.zeteo.me",
     "https://conspiracydistillery.com",
-    "https://peertube.chemnitz.freifunk.net",
     "https://hpstube.fr",
     "https://video.blast-info.fr",
     "https://peertube.bubuit.net",
@@ -1380,7 +1392,6 @@
     "https://peertube.inapurna.org",
     "https://watch.libertaria.space",
     "https://video.triplea.fr",
-    "https://video.catgirl.biz",
     "https://vulgarisation-informatique.fr",
     "https://tube.kotur.org",
     "https://peertube.euskarabildua.eus",
@@ -1430,7 +1441,6 @@
     "https://evangelisch.video",
     "https://tube.anufrij.de",
     "https://videos.mastodont.cat",
-    "https://video.taboulisme.com",
     "https://media.undeadnetwork.de",
     "https://tube.dragonpsi.xyz",
     "https://peertube.nicolastissot.fr",
@@ -1504,11 +1514,9 @@
     "https://video.csc49.fr",
     "https://tube.wolfe.casa",
     "https://video.dresden.network",
-    "https://peertube.zapashcanon.fr",
     "https://40two.tube",
     "https://tube.amic37.fr",
     "https://video.comptoir.net",
-    "https://kino.schuerz.at",
     "https://peertube.tiennot.net",
     "https://tututu.tube",
     "https://tube.picasoft.net",
@@ -1521,14 +1529,12 @@
     "https://videos.testimonia.org",
     "https://video.mass-trespass.uk",
     "https://peertube.cipherbliss.com",
-    "https://peertube.stemy.me",
     "https://daschauher.aksel.rocks",
     "https://tube.cyano.at",
     "https://tube.nox-rhea.org",
     "https://peertube.securitymadein.lu",
     "https://tube.rita.moe",
     "https://tuktube.com",
-    "https://v.basspistol.org",
     "https://mytube.kn-cloud.de",
     "https://tube.nuagelibre.fr",
     "https://video.nogafam.es",
@@ -1547,9 +1553,7 @@
     "https://cinema.yunohost.support",
     "https://peertube.s2s.video",
     "https://peertube.travelpandas.eu",
-    "https://video.sdm-tools.net",
     "https://peertube.anzui.dev",
-    "https://video.up.edu.ph",
     "https://video.igem.org",
     "https://worldofvids.com",
     "https://peertube.underworld.fr",
@@ -1576,8 +1580,6 @@
     "https://video.violoncello.ch",
     "https://peertube.gidikroon.eu",
     "https://tubedu.org",
-    "https://watch.breadtube.tv",
-    "https://video.exodus-privacy.eu.org",
     "https://tilvids.com",
     "https://peertube.devloprog.org",
     "https://peertube.designersethiques.org",
@@ -1614,11 +1616,9 @@
     "https://peertube.netzbegruenung.de",
     "https://plextube.nl",
     "https://tube.opportunis.me",
-    "https://nanawel-peertube.dyndns.org",
     "https://tube-strasbourg.beta.education.fr",
     "https://tube.graz.social",
     "https://tube-besancon.beta.education.fr",
-    "https://vid.garwood.io",
     "https://kolektiva.media",
     "https://peertube.ichigo.everydayimshuflin.com",
     "https://video.lundi.am",
@@ -1643,7 +1643,6 @@
     "https://mplayer.demouliere.eu",
     "https://video.liberta.vip",
     "https://peertube.gcfamily.fr",
-    "https://video.ploud.fr",
     "https://tube.plaf.fr",
     "https://tube.nah.re",
     "https://dreiecksnebel.alex-detsch.de",
@@ -1731,7 +1730,6 @@
     "https://peertube.makotoworkshop.org",
     "https://peertube.serveur.slv-valbonne.fr",
     "https://video.netsyms.com",
-    "https://video.writeas.org",
     "https://videos.adhocmusic.com",
     "https://vid.y-y.li",
     "https://diode.zone",
@@ -1775,4 +1773,4 @@
     "https://peertube2.cpy.re",
     "https://peertube.cpy.re"
   ]
-}
\ No newline at end of file
+}
-- 
cgit 1.4.1


From bd13604ea321bc569cf7721706fc1480be9f98f1 Mon Sep 17 00:00:00 2001
From: Woodpecker CI <woodpecker@codeberg.org>
Date: Thu, 22 Sep 2022 00:10:29 +0000
Subject: updated instances

---
 src/instances/blacklist.json | 14 ++++++++------
 src/instances/data.json      | 24 ++++++++++++++----------
 2 files changed, 22 insertions(+), 16 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 9df5b306..0f717cd2 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -1,13 +1,12 @@
 {
   "cloudflare": [
-    "https://invidious.kavin.rocks",
     "https://invidious.rhyshl.live",
+    "https://invidious.kavin.rocks",
     "https://piped.kavin.rocks",
     "https://piped.tokhmi.xyz",
     "https://piped.moomoo.me",
-    "https://piped.mha.fi",
+    "https://piped.syncpundit.com",
     "https://de-piped.shimul.me",
-    "https://pipedus.palash.dev",
     "https://watch.whatever.social",
     "https://piped.garudalinux.org",
     "https://y.rivo.lol",
@@ -28,6 +27,7 @@
     "https://nitter.sneed.network",
     "https://n.sneed.network",
     "https://nitter.twei.space",
+    "https://nitter.d420.de",
     "https://libreddit.domain.glass",
     "https://r.nf",
     "https://libreddit.hu",
@@ -47,6 +47,7 @@
     "https://tedd.it",
     "https://wiki.privacytools.io",
     "https://teddit.rawbit.ninja",
+    "https://wiki.604kph.xyz",
     "https://wiki.privacytools.io",
     "https://wikiless.rawbit.ninja",
     "https://scribe.rawbit.ninja",
@@ -68,12 +69,12 @@
   "offline": [
     "https://invidious.rhyshl.live",
     "https://invidious.esmailelbob.xyz",
+    "https://invidious.kavin.rocks",
     "https://proxitok.odyssey346.dev",
     "https://nhanh.cloud",
-    "https://nitter.winscloud.net",
+    "https://nitter.hu",
     "https://ntr.odyssey346.dev",
-    "https://r.walkx.org",
-    "https://libreddit.winscloud.net",
+    "https://libredd.it",
     "https://libreddit.notyourcomputer.net",
     "https://teddit.ggc-project.de",
     "https://teddit.nautolan.racing",
@@ -93,6 +94,7 @@
     "https://whoogle.esmailelbob.xyz",
     "https://search.wef.lol",
     "https://i.bcow.xyz",
+    "https://i.actionsack.com",
     "https://lbry.bcow.xyz",
     "https://beatbump.ml"
   ]
diff --git a/src/instances/data.json b/src/instances/data.json
index e9533bfe..ee955bb6 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -4,7 +4,6 @@
       "https://yewtu.be",
       "https://vid.puffyan.us",
       "https://invidious.snopyta.org",
-      "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
       "https://invidio.xamh.de",
       "https://y.com.sb",
@@ -22,7 +21,8 @@
       "https://invidious.weblibre.org",
       "https://invidious.esmailelbob.xyz",
       "https://youtube.076.ne.jp",
-      "https://invidious.namazso.eu"
+      "https://invidious.namazso.eu",
+      "https://invidious.kavin.rocks"
     ],
     "tor": [
       "http://inv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
@@ -44,16 +44,14 @@
       "https://piped.kavin.rocks",
       "https://piped.tokhmi.xyz",
       "https://piped.moomoo.me",
-      "https://piped.mha.fi",
+      "https://piped.syncpundit.com",
       "https://de-piped.shimul.me",
-      "https://pipedus.palash.dev",
       "https://watch.whatever.social",
       "https://piped.garudalinux.org",
       "https://y.rivo.lol",
       "https://yt.jae.fi",
       "https://piped.mint.lgbt",
       "https://il.ax",
-      "https://piped.privacy.com.de",
       "https://piped.projectsegfau.lt",
       "https://piped.privacydev.net",
       "https://piped.palveluntarjoaja.eu",
@@ -205,7 +203,8 @@
       "https://nitter.manasiwibi.com",
       "https://nitter.smnz.de",
       "https://nitter.twei.space",
-      "https://nitter.inpt.fr"
+      "https://nitter.inpt.fr",
+      "https://nitter.d420.de"
     ],
     "tor": [
       "http://nitter7bryz3jv7e3uekphigvmoyoem4al3fynerxkj22dmoxoq553qd.onion",
@@ -524,6 +523,7 @@
     "normal": [
       "https://dynabyte.ca",
       "https://jsearch.pw",
+      "https://privatus.live",
       "https://search.ethibox.fr",
       "https://search.snopyta.org",
       "https://search.stinpriza.org",
@@ -585,7 +585,6 @@
       "https://opnxng.com",
       "https://paulgo.io",
       "https://priv.au",
-      "https://privatus.live",
       "https://s.frlt.one",
       "https://s.zhaocloud.net",
       "https://saber.tk",
@@ -657,6 +656,7 @@
       "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
       "http://searxngg6zleq6ceboe5ltkyo4hyrb3aaycrgzmrljv3jjlb5vcytead.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
+      "http://b2c7fvbhnfvwnl6oh2tydhzfx4i37kmmrycq42heqbbe7wovq3uzenid.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://searx.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
@@ -665,7 +665,7 @@
       "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
       "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
       "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion",
-      "http://lgmekfnpealdqhnctyg3p5fuelpdwnbqbwnl2ickpdoodzatzgz27ryd.onion"
+      "https://lgmekfnpealdqhnctyg3p5fuelpdwnbqbwnl2ickpdoodzatzgz27ryd.onion"
     ],
     "i2p": [],
     "loki": []
@@ -778,7 +778,8 @@
     "normal": [
       "https://hyperpipe.surge.sh",
       "https://hyperpipe.esmailelbob.xyz",
-      "https://listen.whatever.social"
+      "https://listen.whatever.social",
+      "https://music.adminforge.de"
     ],
     "tor": [
       "http://hyperpipe.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion"
@@ -806,6 +807,10 @@
     "loki": []
   },
   "peertube": [
+    "https://guntube.net",
+    "https://pt.freedomwolf.cc",
+    "https://vr360tube.online",
+    "https://bodavr.com",
     "https://peertube.tni-hosted.nl",
     "https://videos.parleur.net",
     "https://tube.azadehafzar.ir",
@@ -833,7 +838,6 @@
     "https://trutube.online",
     "https://tube-cycle-3.apps.education.fr",
     "https://video.manicphase.me",
-    "https://tube.emy.plus",
     "https://tubulus.openlatin.org",
     "https://video.graine-pdl.org",
     "https://tube-cycle-2.apps.education.fr",
-- 
cgit 1.4.1


From 25b9d0bad070c92d67ddb7237b78e8c8f4e1b651 Mon Sep 17 00:00:00 2001
From: Woodpecker CI <woodpecker@codeberg.org>
Date: Sun, 25 Sep 2022 00:10:55 +0000
Subject: updated instances

---
 src/instances/blacklist.json | 15 ++++++---------
 src/instances/data.json      | 44 ++++++++++++++++++--------------------------
 2 files changed, 24 insertions(+), 35 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 0f717cd2..bedaa748 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -1,12 +1,13 @@
 {
   "cloudflare": [
-    "https://invidious.rhyshl.live",
     "https://invidious.kavin.rocks",
+    "https://invidious.rhyshl.live",
     "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://pipedus.palash.dev",
     "https://watch.whatever.social",
     "https://piped.garudalinux.org",
     "https://y.rivo.lol",
@@ -47,7 +48,6 @@
     "https://tedd.it",
     "https://wiki.privacytools.io",
     "https://teddit.rawbit.ninja",
-    "https://wiki.604kph.xyz",
     "https://wiki.privacytools.io",
     "https://wikiless.rawbit.ninja",
     "https://scribe.rawbit.ninja",
@@ -68,20 +68,18 @@
   ],
   "offline": [
     "https://invidious.rhyshl.live",
-    "https://invidious.esmailelbob.xyz",
-    "https://invidious.kavin.rocks",
+    "https://piped.esmailelbob.xyz",
     "https://proxitok.odyssey346.dev",
     "https://nhanh.cloud",
-    "https://nitter.hu",
     "https://ntr.odyssey346.dev",
     "https://libredd.it",
     "https://libreddit.notyourcomputer.net",
     "https://teddit.ggc-project.de",
     "https://teddit.nautolan.racing",
-    "https://tedd.it",
-    "https://wiki.froth.zone",
+    "https://quetreus.herokuapp.com",
     "https://quetre.odyssey346.dev",
     "https://translate.northboot.xyz",
+    "https://translate.priv.pw",
     "https://st.odyssey346.dev",
     "https://jsearch.pw",
     "https://searx.gnu.style",
@@ -92,7 +90,6 @@
     "https://searx.fmac.xyz",
     "https://www.webrats.xyz",
     "https://whoogle.esmailelbob.xyz",
-    "https://search.wef.lol",
     "https://i.bcow.xyz",
     "https://i.actionsack.com",
     "https://lbry.bcow.xyz",
diff --git a/src/instances/data.json b/src/instances/data.json
index ee955bb6..a5e6cb1f 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -4,13 +4,14 @@
       "https://yewtu.be",
       "https://vid.puffyan.us",
       "https://invidious.snopyta.org",
+      "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
       "https://invidio.xamh.de",
       "https://y.com.sb",
       "https://yt.artemislena.eu",
       "https://invidious.sethforprivacy.com",
-      "https://invidious.flokinet.to",
       "https://invidious.tiekoetter.com",
+      "https://invidious.flokinet.to",
       "https://inv.bp.projectsegfau.lt",
       "https://inv.vern.cc",
       "https://invidious.projectsegfau.lt",
@@ -18,13 +19,13 @@
       "https://invidious.rhyshl.live",
       "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
-      "https://invidious.weblibre.org",
       "https://invidious.esmailelbob.xyz",
       "https://youtube.076.ne.jp",
-      "https://invidious.namazso.eu",
-      "https://invidious.kavin.rocks"
+      "https://invidious.weblibre.org",
+      "https://invidious.namazso.eu"
     ],
     "tor": [
+      "http://am74vkcrjp2d5v36lcdqgsj2m6x36tbrkhsruoegwfcizzabnfgf5zyd.onion",
       "http://inv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
       "http://invidious.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
       "http://euxxcnhsynwmfidvhjf6uzptsmh4dipkmgdmcmxxuo7tunp3ad2jrwyd.onion",
@@ -34,7 +35,7 @@
       "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion",
       "http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion",
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
-      "http://am74vkcrjp2d5v36lcdqgsj2m6x36tbrkhsruoegwfcizzabnfgf5zyd.onion"
+      "http://ng27owmagn5amdm7l5s3rsqxwscl5ynppnis5dqcasogkyxcfqn7psid.onion"
     ],
     "i2p": [],
     "loki": []
@@ -44,14 +45,16 @@
       "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://pipedus.palash.dev",
       "https://watch.whatever.social",
       "https://piped.garudalinux.org",
       "https://y.rivo.lol",
       "https://yt.jae.fi",
       "https://piped.mint.lgbt",
       "https://il.ax",
+      "https://piped.esmailelbob.xyz",
       "https://piped.projectsegfau.lt",
       "https://piped.privacydev.net",
       "https://piped.palveluntarjoaja.eu",
@@ -455,16 +458,8 @@
     "loki": []
   },
   "libremdb": {
-    "normal": [
-      "https://libremdb.herokuapp.com",
-      "https://libremdb.pussthecat.org",
-      "https://libremdbeu.herokuapp.com",
-      "https://lmdb.tokhmi.xyz",
-      "https://libremdb.esmailelbob.xyz"
-    ],
-    "tor": [
-      "http://libremdb.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion"
-    ],
+    "normal": [],
+    "tor": [],
     "i2p": [],
     "loki": []
   },
@@ -523,7 +518,6 @@
     "normal": [
       "https://dynabyte.ca",
       "https://jsearch.pw",
-      "https://privatus.live",
       "https://search.ethibox.fr",
       "https://search.snopyta.org",
       "https://search.stinpriza.org",
@@ -560,8 +554,10 @@
     ],
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
+      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
+      "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
       "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
       "http://searxfilowxokbogygrigir4wqxfxqzuxofxgdon7dg6rsii4yxzytyd.onion"
@@ -585,6 +581,7 @@
       "https://opnxng.com",
       "https://paulgo.io",
       "https://priv.au",
+      "https://privatus.live",
       "https://s.frlt.one",
       "https://s.zhaocloud.net",
       "https://saber.tk",
@@ -647,17 +644,16 @@
       "https://trydex.tk/searxng",
       "https://www.gruble.de",
       "https://www.webrats.xyz",
+      "https://xcxc.ml",
       "https://xo.wtf"
     ],
     "tor": [
-      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
       "http://privateoz3u5utrimal2edr56j3r5caakektxxgixigdkycuxigvquid.onion",
       "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
       "http://searxngg6zleq6ceboe5ltkyo4hyrb3aaycrgzmrljv3jjlb5vcytead.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://b2c7fvbhnfvwnl6oh2tydhzfx4i37kmmrycq42heqbbe7wovq3uzenid.onion",
-      "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://searx.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
@@ -807,6 +803,9 @@
     "loki": []
   },
   "peertube": [
+    "https://video.vegafjord.me",
+    "https://peertube-us.howlround.com",
+    "https://peertube-eu.howlround.com",
     "https://guntube.net",
     "https://pt.freedomwolf.cc",
     "https://vr360tube.online",
@@ -864,7 +863,6 @@
     "https://video.3cmr.fr",
     "https://peertube.miguelcr.me",
     "https://video.thinkof.name",
-    "https://nekofans.tv",
     "https://video.comun.al",
     "https://video.occm.cc",
     "https://tube-action-educative.apps.education.fr",
@@ -882,7 +880,6 @@
     "https://tube-education-physique-et-sportive.apps.education.fr",
     "https://videos.lemouvementassociatif-pdl.org",
     "https://playroom.kitsunes.world",
-    "https://tube2.nous.media",
     "https://peertube.0x5e.eu",
     "https://tube.darknight-coffee.org",
     "https://play.mittdata.se",
@@ -961,7 +958,6 @@
     "https://videos.grafo.zone",
     "https://tube.chocoflan.net",
     "https://video.pthreat.co",
-    "https://peertube.egroc.de",
     "https://pt.k2s.sk",
     "https://video.cats-home.net",
     "https://peertube.narrativerry.xyz",
@@ -1019,7 +1015,6 @@
     "https://video.mttv.it",
     "https://peertube.cloud.nerdraum.de",
     "https://vid.pretok.tv",
-    "https://videos.slownewsdayshow.com",
     "https://videos.sarcasmstardust.com",
     "https://videos.factsonthegroundshow.com",
     "https://tv.santic-zombie.ru",
@@ -1047,7 +1042,6 @@
     "https://peertube.beardedtek.com",
     "https://creemoseducacioninclusiva.uma.es",
     "https://videos.yeswiki.net",
-    "https://peertube.autogestioncitoyenne.org",
     "https://video.r3s.nrw",
     "https://peertube.semweb.pro",
     "https://poast.tv",
@@ -1068,7 +1062,6 @@
     "https://tube.koweb.fr",
     "https://peertube.genma.fr",
     "https://tv.generallyrubbish.net.au",
-    "https://videos.codingotaku.com",
     "https://foss.tube",
     "https://peertube.satoshishop.de",
     "https://ua.peertube.red",
@@ -1457,7 +1450,6 @@
     "https://video.ecole-89.com",
     "https://tube.kai-stuht.com",
     "https://video.fbxl.net",
-    "https://live.libratoi.org",
     "https://video.p1ng0ut.social",
     "https://watch.deranalyst.ch",
     "https://video.discord-insoumis.fr",
-- 
cgit 1.4.1


From 59f3c627dc4f9d2cb7980fa12dbaa21d65d6e55d Mon Sep 17 00:00:00 2001
From: Woodpecker CI <woodpecker@codeberg.org>
Date: Wed, 28 Sep 2022 00:09:03 +0000
Subject: updated instances

---
 src/instances/blacklist.json | 16 +++++---
 src/instances/data.json      | 94 +++++++++++++++++---------------------------
 2 files changed, 48 insertions(+), 62 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index bedaa748..2212ddb9 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -5,6 +5,7 @@
     "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://pipedus.palash.dev",
@@ -32,7 +33,6 @@
     "https://libreddit.domain.glass",
     "https://r.nf",
     "https://libreddit.hu",
-    "https://lr.stilic.ml",
     "https://reddi.tk",
     "https://r.walkx.org",
     "https://libreddit.yonalee.eu",
@@ -41,6 +41,8 @@
     "https://reddit.dr460nf1r3.org",
     "https://libreddit.encrypted-data.xyz",
     "https://libreddit.eu.org",
+    "https://libreddit.cachyos.org",
+    "https://futureddit.gq",
     "https://teddit.domain.glass",
     "https://teddit.httpjames.space",
     "https://teddit.encrypted-data.xyz",
@@ -68,18 +70,21 @@
   ],
   "offline": [
     "https://invidious.rhyshl.live",
-    "https://piped.esmailelbob.xyz",
+    "https://invidious.esmailelbob.xyz",
     "https://proxitok.odyssey346.dev",
     "https://nhanh.cloud",
     "https://ntr.odyssey346.dev",
-    "https://libredd.it",
-    "https://libreddit.notyourcomputer.net",
+    "https://reddi.tk",
+    "https://libreddit.yonalee.eu",
     "https://teddit.ggc-project.de",
     "https://teddit.nautolan.racing",
+    "https://scribe.esmailelbob.xyz",
+    "https://wuetre.herokuapp.com",
     "https://quetreus.herokuapp.com",
     "https://quetre.odyssey346.dev",
+    "https://libremdbeu.herokuapp.com",
+    "https://simplytranslate.org",
     "https://translate.northboot.xyz",
-    "https://translate.priv.pw",
     "https://st.odyssey346.dev",
     "https://jsearch.pw",
     "https://searx.gnu.style",
@@ -90,6 +95,7 @@
     "https://searx.fmac.xyz",
     "https://www.webrats.xyz",
     "https://whoogle.esmailelbob.xyz",
+    "https://search.wef.lol",
     "https://i.bcow.xyz",
     "https://i.actionsack.com",
     "https://lbry.bcow.xyz",
diff --git a/src/instances/data.json b/src/instances/data.json
index a5e6cb1f..40d07b3f 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -21,13 +21,12 @@
       "https://invidious.slipfox.xyz",
       "https://invidious.esmailelbob.xyz",
       "https://youtube.076.ne.jp",
-      "https://invidious.weblibre.org",
       "https://invidious.namazso.eu"
     ],
     "tor": [
       "http://am74vkcrjp2d5v36lcdqgsj2m6x36tbrkhsruoegwfcizzabnfgf5zyd.onion",
       "http://inv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
-      "http://invidious.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
+      "http://invidious.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://euxxcnhsynwmfidvhjf6uzptsmh4dipkmgdmcmxxuo7tunp3ad2jrwyd.onion",
       "http://u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad.onion",
       "http://osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion",
@@ -45,6 +44,7 @@
       "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://pipedus.palash.dev",
@@ -54,13 +54,13 @@
       "https://yt.jae.fi",
       "https://piped.mint.lgbt",
       "https://il.ax",
-      "https://piped.esmailelbob.xyz",
       "https://piped.projectsegfau.lt",
       "https://piped.privacydev.net",
       "https://piped.palveluntarjoaja.eu",
       "https://piped.smnz.de",
       "https://piped.adminforge.de",
-      "https://watch.whatevertinfoil.de"
+      "https://watch.whatevertinfoil.de",
+      "https://piped.qdi.fi"
     ],
     "tor": [],
     "i2p": [],
@@ -131,7 +131,7 @@
   "nitter": {
     "normal": [
       "https://nitter.net",
-      "https://nitter.42l.fr",
+      "https://nitter.lacontrevoie.fr",
       "https://nitter.pussthecat.org",
       "https://nitter:nitter@nitter.nixnet.services",
       "https://nitter.fdn.fr",
@@ -207,7 +207,8 @@
       "https://nitter.smnz.de",
       "https://nitter.twei.space",
       "https://nitter.inpt.fr",
-      "https://nitter.d420.de"
+      "https://nitter.d420.de",
+      "https://nitter.caioalonso.com"
     ],
     "tor": [
       "http://nitter7bryz3jv7e3uekphigvmoyoem4al3fynerxkj22dmoxoq553qd.onion",
@@ -260,85 +261,56 @@
   },
   "libreddit": {
     "normal": [
-      "https://libredd.it",
       "https://libreddit.spike.codes",
-      "https://libreddit.dothq.co",
       "https://libreddit.kavin.rocks",
       "https://reddit.invak.id",
-      "https://reddit.phii.me",
       "https://lr.riverside.rocks",
       "https://libreddit.strongthany.cc",
-      "https://libreddit.database.red",
       "https://libreddit.privacy.com.de",
       "https://libreddit.domain.glass",
-      "https://libreddit.sugoma.tk",
-      "https://libreddit.jamiethalacker.dev",
-      "https://reddit.artemislena.eu",
       "https://r.nf",
-      "https://libreddit.some-things.org",
       "https://reddit.stuehieyr.com",
       "https://lr.mint.lgbt",
-      "https://libreddit.igna.rocks",
-      "https://libreddit.autarkic.org",
-      "https://libreddit.flux.industries",
       "https://libreddit.drivet.xyz",
-      "https://lr.oversold.host",
       "https://libreddit.de",
       "https://libreddit.pussthecat.org",
       "https://libreddit.mutahar.rocks",
       "https://libreddit.northboot.xyz",
       "https://leddit.xyz",
-      "https://de.leddit.xyz",
-      "https://lr.cowfee.moe",
       "https://libreddit.hu",
       "https://libreddit.totaldarkness.net",
       "https://libreddit.esmailelbob.xyz",
       "https://lr.vern.cc",
       "https://libreddit.nl",
-      "https://lr.stilic.ml",
       "https://reddi.tk",
-      "https://libreddit.bus-hit.me",
-      "https://libreddit.datatunnel.xyz",
-      "https://libreddit.crewz.me",
       "https://r.walkx.org",
       "https://libreddit.kylrth.com",
       "https://libreddit.yonalee.eu",
       "https://libreddit.winscloud.net",
       "https://libreddit.tiekoetter.com",
       "https://reddit.rtrace.io",
-      "https://libreddit.lunar.icu",
       "https://libreddit.privacydev.net",
-      "https://libreddit.notyourcomputer.net",
       "https://r.ahwx.org",
       "https://bob.fr.to",
-      "https://reddit.beparanoid.de",
       "https://libreddit.dcs0.hu",
       "https://reddit.dr460nf1r3.org",
       "https://rd.jae.su",
-      "https://libreddit.mha.fi",
       "https://libreddit.foss.wtf",
       "https://libreddit.encrypted-data.xyz",
       "https://libreddit.eu.org",
-      "https://l.opnxng.com"
+      "https://l.opnxng.com",
+      "https://libreddit.cachyos.org",
+      "https://rd.funami.tech",
+      "https://libreddit.projectsegfau.lt",
+      "https://futureddit.gq",
+      "https://lr.slipfox.xyz",
+      "https://libreddit.oxymagnesium.com"
     ],
     "tor": [
-      "http://spjmllawtheisznfs7uryhxumin26ssv2draj7oope3ok3wuhy43eoyd.onion",
-      "http://fwhhsbrbltmrct5hshrnqlqygqvcgmnek3cnka55zj4y7nuus5muwyyd.onion",
-      "http://kphht2jcflojtqte4b4kyx7p2ahagv4debjj32nre67dxz7y57seqwyd.onion",
-      "http://inytumdgnri7xsqtvpntjevaelxtgbjqkuqhtf6txxhwbll2fwqtakqd.onion",
-      "http://liredejj74h5xjqr2dylnl5howb2bpikfowqoveub55ru27x43357iid.onion",
       "http://kzhfp3nvb4qp575vy23ccbrgfocezjtl5dx66uthgrhu7nscu6rcwjyd.onion",
       "http://ecue64ybzvn6vjzl37kcsnwt4ycmbsyf74nbttyg7rkc3t3qwnj7mcyd.onion",
-      "http://ledditqo2mxfvlgobxnlhrkq4dh34jss6evfkdkb2thlvy6dn4f4gpyd.onion",
-      "http://libredoxhxwnmsb6dvzzd35hmgzmawsq5i764es7witwhddvpc2razid.onion",
-      "http://libreddit.2syis2nnyytz6jnusnjurva4swlaizlnleiks5mjp46phuwjbdjqwgqd.onion",
-      "http://ol5begilptoou34emq2sshf3may3hlblvipdjtybbovpb7c7zodxmtqd.onion",
-      "http://lbrdtjaj7567ptdd4rv74lv27qhxfkraabnyphgcvptl64ijx2tijwid.onion",
-      "http://libreddit.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
-      "http://reddit.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion",
-      "http://inz6tbezfwzexva6dize4cqraj2tjdhygxabmcgysccesvw2pybzhbyd.onion",
-      "http://libreddit.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
-      "http://lr.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
+      "http://libreddit.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
+      "http://ojwp2gtj7dq7scd7gnbac6wp53tklgsicteabrnx2pr7zai64wriiaad.onion"
     ],
     "i2p": [],
     "loki": []
@@ -448,7 +420,8 @@
       "https://quetre.tokhmi.xyz",
       "https://quetre.projectsegfau.lt",
       "https://quetre.esmailelbob.xyz",
-      "https://quetre.odyssey346.dev"
+      "https://quetre.odyssey346.dev",
+      "http://vernnflenvsqccuanaun7yydnmturi4jkyxlyzhn6ultpje66c3q.b32.i2p"
     ],
     "tor": [
       "http://quetre.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
@@ -458,8 +431,19 @@
     "loki": []
   },
   "libremdb": {
-    "normal": [],
-    "tor": [],
+    "normal": [
+      "https://libremdb.iket.me",
+      "https://libremdb.pussthecat.org",
+      "https://libremdbeu.herokuapp.com",
+      "https://lmdb.tokhmi.xyz",
+      "https://libremdb.esmailelbob.xyz",
+      "https://ld.vern.cc",
+      "http://vernz3ubrntql4wrgyrssd6u3qzi36zrhz2agbo6vibzbs5olk2q.b32.i2p"
+    ],
+    "tor": [
+      "http://libremdb.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
+      "http://ld.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
+    ],
     "i2p": [],
     "loki": []
   },
@@ -557,7 +541,6 @@
       "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
-      "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
       "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
       "http://searxfilowxokbogygrigir4wqxfxqzuxofxgdon7dg6rsii4yxzytyd.onion"
@@ -654,6 +637,7 @@
       "http://searxngg6zleq6ceboe5ltkyo4hyrb3aaycrgzmrljv3jjlb5vcytead.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://b2c7fvbhnfvwnl6oh2tydhzfx4i37kmmrycq42heqbbe7wovq3uzenid.onion",
+      "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://searx.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
@@ -691,6 +675,7 @@
       "https://librex.beparanoid.de",
       "https://librex.extravi.dev",
       "https://search.davidovski.xyz",
+      "https://librex.kitscomputer.tk",
       "https://search.funami.tech",
       "https://librex.catalyst.sx",
       "https://search.madreyk.xyz",
@@ -698,8 +683,7 @@
     ],
     "tor": [
       "http://librex.2356uhnbpv5nk3bni5bv6jg2cd6lgj664kwx3lhyelstpttpyv4kk2qd.onion",
-      "http://ncblhz7q4sfbf755bdbhebfzxcpypz7ewafgi4agatecojz7pln4i3id.onion",
-      "http://librex.so2mpiyfo4cje7bof5v52y3cvjyo2haxpqfvut4sr6gj2ul4mddx2jid.onion"
+      "http://ncblhz7q4sfbf755bdbhebfzxcpypz7ewafgi4agatecojz7pln4i3id.onion"
     ],
     "i2p": [
       "http://rra33hiaf6nmby7jfpqe2gqmng3jnzkvbu2n7jgce7vbhoyuhzya.b32.i2p"
@@ -803,6 +787,9 @@
     "loki": []
   },
   "peertube": [
+    "https://ytube.retronerd.at",
+    "https://tube.media-techport.de",
+    "https://notobono.de",
     "https://video.vegafjord.me",
     "https://peertube-us.howlround.com",
     "https://peertube-eu.howlround.com",
@@ -863,7 +850,6 @@
     "https://video.3cmr.fr",
     "https://peertube.miguelcr.me",
     "https://video.thinkof.name",
-    "https://video.comun.al",
     "https://video.occm.cc",
     "https://tube-action-educative.apps.education.fr",
     "https://jahve.pl",
@@ -1023,8 +1009,6 @@
     "https://video.snug.moe",
     "https://video.avant-le-strike.buzz",
     "https://videos.ritimo.org",
-    "https://videos.ephphatha.church",
-    "https://video.cerclearistote.com",
     "https://video.greenmycity.eu",
     "https://przej.me",
     "https://pt.mezzo.moe",
@@ -1089,7 +1073,6 @@
     "https://polskijutub.mkljczk.pl",
     "https://peertube.noussommes.org",
     "https://exode.me",
-    "https://megatube.lilomoino.fr",
     "https://video.anartist.org",
     "https://peertube.home.x0r.fr",
     "https://peertube.marud.fr",
@@ -1160,7 +1143,6 @@
     "https://video.antopie.org",
     "https://vtr.chikichiki.tube",
     "https://fedimovie.com",
-    "https://videos.thinkerview.com",
     "https://tube.doctors4covidethics.org",
     "https://yoba.tv",
     "https://tube.mediainformationcenter.de",
@@ -1296,7 +1278,6 @@
     "https://peertube.alpharius.io",
     "https://ptb.lunarviews.net",
     "https://ovaltube.codinglab.ch",
-    "https://video.wilkie.how",
     "https://videos.ahp-numerique.fr",
     "https://auf1.eu",
     "https://tube.toontoet.nl",
@@ -1621,7 +1602,6 @@
     "https://peertube.debian.social",
     "https://tube.piweb.be",
     "https://peertube.su",
-    "https://video.hackers.town",
     "https://tube.fdn.fr",
     "https://peertube.demonix.fr",
     "https://videos.hauspie.fr",
-- 
cgit 1.4.1


From 667c22dcafb03b4883b42471addac7d4849cf652 Mon Sep 17 00:00:00 2001
From: Woodpecker CI <woodpecker@codeberg.org>
Date: Sat, 1 Oct 2022 00:09:13 +0000
Subject: updated instances

---
 src/instances/blacklist.json | 13 +++----------
 src/instances/data.json      | 38 +++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 29 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 2212ddb9..79cdc94f 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -35,7 +35,6 @@
     "https://libreddit.hu",
     "https://reddi.tk",
     "https://r.walkx.org",
-    "https://libreddit.yonalee.eu",
     "https://libreddit.winscloud.net",
     "https://r.ahwx.org",
     "https://reddit.dr460nf1r3.org",
@@ -50,6 +49,7 @@
     "https://tedd.it",
     "https://wiki.privacytools.io",
     "https://teddit.rawbit.ninja",
+    "https://wiki.604kph.xyz",
     "https://wiki.privacytools.io",
     "https://wikiless.rawbit.ninja",
     "https://scribe.rawbit.ninja",
@@ -73,18 +73,11 @@
     "https://invidious.esmailelbob.xyz",
     "https://proxitok.odyssey346.dev",
     "https://nhanh.cloud",
+    "https://nitter.winscloud.net",
     "https://ntr.odyssey346.dev",
-    "https://reddi.tk",
-    "https://libreddit.yonalee.eu",
+    "https://libreddit.winscloud.net",
     "https://teddit.ggc-project.de",
-    "https://teddit.nautolan.racing",
-    "https://scribe.esmailelbob.xyz",
-    "https://wuetre.herokuapp.com",
-    "https://quetreus.herokuapp.com",
     "https://quetre.odyssey346.dev",
-    "https://libremdbeu.herokuapp.com",
-    "https://simplytranslate.org",
-    "https://translate.northboot.xyz",
     "https://st.odyssey346.dev",
     "https://jsearch.pw",
     "https://searx.gnu.style",
diff --git a/src/instances/data.json b/src/instances/data.json
index 40d07b3f..41a43bcd 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -14,8 +14,8 @@
       "https://invidious.flokinet.to",
       "https://inv.bp.projectsegfau.lt",
       "https://inv.vern.cc",
-      "https://invidious.projectsegfau.lt",
       "https://invidious.nerdvpn.de",
+      "https://invidious.projectsegfau.lt",
       "https://invidious.rhyshl.live",
       "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
@@ -208,7 +208,9 @@
       "https://nitter.twei.space",
       "https://nitter.inpt.fr",
       "https://nitter.d420.de",
-      "https://nitter.caioalonso.com"
+      "https://nitter.caioalonso.com",
+      "https://nitter.at",
+      "https://nitter.drivet.xyz"
     ],
     "tor": [
       "http://nitter7bryz3jv7e3uekphigvmoyoem4al3fynerxkj22dmoxoq553qd.onion",
@@ -274,7 +276,6 @@
       "https://libreddit.drivet.xyz",
       "https://libreddit.de",
       "https://libreddit.pussthecat.org",
-      "https://libreddit.mutahar.rocks",
       "https://libreddit.northboot.xyz",
       "https://leddit.xyz",
       "https://libreddit.hu",
@@ -285,7 +286,6 @@
       "https://reddi.tk",
       "https://r.walkx.org",
       "https://libreddit.kylrth.com",
-      "https://libreddit.yonalee.eu",
       "https://libreddit.winscloud.net",
       "https://libreddit.tiekoetter.com",
       "https://reddit.rtrace.io",
@@ -420,14 +420,15 @@
       "https://quetre.tokhmi.xyz",
       "https://quetre.projectsegfau.lt",
       "https://quetre.esmailelbob.xyz",
-      "https://quetre.odyssey346.dev",
-      "http://vernnflenvsqccuanaun7yydnmturi4jkyxlyzhn6ultpje66c3q.b32.i2p"
+      "https://quetre.odyssey346.dev"
     ],
     "tor": [
       "http://quetre.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://qr.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
     ],
-    "i2p": [],
+    "i2p": [
+      "http://vernnflenvsqccuanaun7yydnmturi4jkyxlyzhn6ultpje66c3q.b32.i2p"
+    ],
     "loki": []
   },
   "libremdb": {
@@ -437,14 +438,15 @@
       "https://libremdbeu.herokuapp.com",
       "https://lmdb.tokhmi.xyz",
       "https://libremdb.esmailelbob.xyz",
-      "https://ld.vern.cc",
-      "http://vernz3ubrntql4wrgyrssd6u3qzi36zrhz2agbo6vibzbs5olk2q.b32.i2p"
+      "https://ld.vern.cc"
     ],
     "tor": [
       "http://libremdb.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://ld.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
     ],
-    "i2p": [],
+    "i2p": [
+      "http://vernz3ubrntql4wrgyrssd6u3qzi36zrhz2agbo6vibzbs5olk2q.b32.i2p"
+    ],
     "loki": []
   },
   "simplyTranslate": {
@@ -538,12 +540,11 @@
     ],
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
-      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
       "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
-      "http://searxfilowxokbogygrigir4wqxfxqzuxofxgdon7dg6rsii4yxzytyd.onion"
+      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -617,7 +618,8 @@
       "https://searx.slipfox.xyz/searx",
       "https://searx.tiekoetter.com",
       "https://searx.zcyph.cc",
-      "https://searxng.nicfab.it",
+      "https://searxng.dupa.edu.pl",
+      "https://searxng.nicfab.eu",
       "https://searxng.zackptg5.com",
       "https://serx.ml",
       "https://sh0.it",
@@ -631,6 +633,7 @@
       "https://xo.wtf"
     ],
     "tor": [
+      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
       "http://privateoz3u5utrimal2edr56j3r5caakektxxgixigdkycuxigvquid.onion",
       "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
@@ -639,7 +642,7 @@
       "http://b2c7fvbhnfvwnl6oh2tydhzfx4i37kmmrycq42heqbbe7wovq3uzenid.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://searx.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
-      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
+      "http://searxfilowxokbogygrigir4wqxfxqzuxofxgdon7dg6rsii4yxzytyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
       "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
@@ -787,13 +790,14 @@
     "loki": []
   },
   "peertube": [
+    "https://tube.kansanvalta.org",
+    "https://duanrra.cf",
     "https://ytube.retronerd.at",
     "https://tube.media-techport.de",
     "https://notobono.de",
     "https://video.vegafjord.me",
     "https://peertube-us.howlround.com",
     "https://peertube-eu.howlround.com",
-    "https://guntube.net",
     "https://pt.freedomwolf.cc",
     "https://vr360tube.online",
     "https://bodavr.com",
@@ -1020,7 +1024,6 @@
     "https://bee-tube.fr",
     "https://vid.prometheus.systems",
     "https://tube.nx12.net",
-    "https://redundant2.peertube.support",
     "https://peertube.ignifi.me",
     "https://tv.based.quest",
     "https://peertube.beardedtek.com",
@@ -1039,7 +1042,6 @@
     "https://peertube.chatinbit.com",
     "https://peertube.ffs2play.fr",
     "https://peertube.swarm.solvingmaz.es",
-    "https://film.node9.org",
     "https://peertube.mi-site.net",
     "https://raptube.antipub.org",
     "https://video.cm-en-transition.fr",
@@ -1147,7 +1149,6 @@
     "https://yoba.tv",
     "https://tube.mediainformationcenter.de",
     "https://peertube.communecter.org",
-    "https://peertube.librosphere.fr",
     "https://queermotion.org",
     "https://video.audiovisuel-participatif.org",
     "https://peertube.vip",
@@ -1477,7 +1478,6 @@
     "https://fotogramas.politicaconciencia.org",
     "https://peertube.pl",
     "https://peertube.manalejandro.com",
-    "https://www4.mir.inter21.net",
     "https://video.csc49.fr",
     "https://tube.wolfe.casa",
     "https://video.dresden.network",
-- 
cgit 1.4.1


From d980c4c70e835488721666996e2408801eea4970 Mon Sep 17 00:00:00 2001
From: Woodpecker CI <woodpecker@codeberg.org>
Date: Tue, 4 Oct 2022 00:09:57 +0000
Subject: updated instances

---
 src/instances/blacklist.json |  4 ++++
 src/instances/data.json      | 42 ++++++++++++++++++++----------------------
 2 files changed, 24 insertions(+), 22 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 79cdc94f..cbbb3b24 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -71,13 +71,16 @@
   "offline": [
     "https://invidious.rhyshl.live",
     "https://invidious.esmailelbob.xyz",
+    "https://cringe.whatever.social",
     "https://proxitok.odyssey346.dev",
     "https://nhanh.cloud",
     "https://nitter.winscloud.net",
     "https://ntr.odyssey346.dev",
     "https://libreddit.winscloud.net",
     "https://teddit.ggc-project.de",
+    "https://teddit.tokhmi.xyz",
     "https://quetre.odyssey346.dev",
+    "https://translate.northboot.xyz",
     "https://st.odyssey346.dev",
     "https://jsearch.pw",
     "https://searx.gnu.style",
@@ -91,6 +94,7 @@
     "https://search.wef.lol",
     "https://i.bcow.xyz",
     "https://i.actionsack.com",
+    "https://rimgo.mha.fi",
     "https://lbry.bcow.xyz",
     "https://beatbump.ml"
   ]
diff --git a/src/instances/data.json b/src/instances/data.json
index 41a43bcd..3a8e721d 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -10,7 +10,6 @@
       "https://y.com.sb",
       "https://yt.artemislena.eu",
       "https://invidious.sethforprivacy.com",
-      "https://invidious.tiekoetter.com",
       "https://invidious.flokinet.to",
       "https://inv.bp.projectsegfau.lt",
       "https://inv.vern.cc",
@@ -21,6 +20,7 @@
       "https://invidious.slipfox.xyz",
       "https://invidious.esmailelbob.xyz",
       "https://youtube.076.ne.jp",
+      "https://invidious.tiekoetter.com",
       "https://invidious.namazso.eu"
     ],
     "tor": [
@@ -210,7 +210,8 @@
       "https://nitter.d420.de",
       "https://nitter.caioalonso.com",
       "https://nitter.at",
-      "https://nitter.drivet.xyz"
+      "https://nitter.drivet.xyz",
+      "https://nitter.pw"
     ],
     "tor": [
       "http://nitter7bryz3jv7e3uekphigvmoyoem4al3fynerxkj22dmoxoq553qd.onion",
@@ -509,11 +510,13 @@
       "https://search.stinpriza.org",
       "https://search.trom.tf",
       "https://searx.bissisoft.com",
+      "https://searx.chocoflan.net",
       "https://searx.divided-by-zero.eu",
       "https://searx.dresden.network",
       "https://searx.fossencdi.org",
       "https://searx.gnu.style",
       "https://searx.mastodontech.de",
+      "https://searx.mistli.net",
       "https://searx.mxchange.org",
       "https://searx.nakhan.net",
       "https://searx.netzspielplatz.de",
@@ -540,11 +543,15 @@
     ],
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
+      "http://b2c7fvbhnfvwnl6oh2tydhzfx4i37kmmrycq42heqbbe7wovq3uzenid.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
       "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
-      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
+      "http://searxfilowxokbogygrigir4wqxfxqzuxofxgdon7dg6rsii4yxzytyd.onion",
+      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
+      "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion",
+      "http://lgmekfnpealdqhnctyg3p5fuelpdwnbqbwnl2ickpdoodzatzgz27ryd.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -567,6 +574,7 @@
       "https://priv.au",
       "https://privatus.live",
       "https://s.frlt.one",
+      "https://s.trung.fun",
       "https://s.zhaocloud.net",
       "https://saber.tk",
       "https://search.0relay.com",
@@ -597,7 +605,6 @@
       "https://searx.baczek.me",
       "https://searx.be",
       "https://searx.becomesovran.com",
-      "https://searx.chocoflan.net",
       "https://searx.ebnar.xyz",
       "https://searx.ericaftereric.top",
       "https://searx.esmailelbob.xyz",
@@ -606,7 +613,6 @@
       "https://searx.gnous.eu",
       "https://searx.kujonello.cf",
       "https://searx.mha.fi",
-      "https://searx.mistli.net",
       "https://searx.namejeff.xyz",
       "https://searx.org",
       "https://searx.orion-hub.fr",
@@ -639,16 +645,12 @@
       "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
       "http://searxngg6zleq6ceboe5ltkyo4hyrb3aaycrgzmrljv3jjlb5vcytead.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
-      "http://b2c7fvbhnfvwnl6oh2tydhzfx4i37kmmrycq42heqbbe7wovq3uzenid.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://searx.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
-      "http://searxfilowxokbogygrigir4wqxfxqzuxofxgdon7dg6rsii4yxzytyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
       "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
-      "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
-      "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion",
-      "https://lgmekfnpealdqhnctyg3p5fuelpdwnbqbwnl2ickpdoodzatzgz27ryd.onion"
+      "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion"
     ],
     "i2p": [],
     "loki": []
@@ -677,19 +679,23 @@
     "normal": [
       "https://librex.beparanoid.de",
       "https://librex.extravi.dev",
+      "https://lx.vern.cc",
       "https://search.davidovski.xyz",
       "https://librex.kitscomputer.tk",
       "https://search.funami.tech",
       "https://librex.catalyst.sx",
       "https://search.madreyk.xyz",
-      "https://search.pabloferreiro.es"
+      "https://search.pabloferreiro.es",
+      "https://buscar.weblibre.org"
     ],
     "tor": [
       "http://librex.2356uhnbpv5nk3bni5bv6jg2cd6lgj664kwx3lhyelstpttpyv4kk2qd.onion",
-      "http://ncblhz7q4sfbf755bdbhebfzxcpypz7ewafgi4agatecojz7pln4i3id.onion"
+      "http://ncblhz7q4sfbf755bdbhebfzxcpypz7ewafgi4agatecojz7pln4i3id.onion",
+      "http://lx.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
     ],
     "i2p": [
-      "http://rra33hiaf6nmby7jfpqe2gqmng3jnzkvbu2n7jgce7vbhoyuhzya.b32.i2p"
+      "http://rra33hiaf6nmby7jfpqe2gqmng3jnzkvbu2n7jgce7vbhoyuhzya.b32.i2p",
+      "http://vernziqfqvweijfaacmwazohgpdo2bt2ib2jlupt2pwwu27bhgxq.b32.i2p"
     ],
     "loki": []
   },
@@ -790,6 +796,7 @@
     "loki": []
   },
   "peertube": [
+    "https://tbh.co-shaoghal.net",
     "https://tube.kansanvalta.org",
     "https://duanrra.cf",
     "https://ytube.retronerd.at",
@@ -928,13 +935,11 @@
     "https://videos.tormentasolar.win",
     "https://tube.nestor.coop",
     "https://live.oldskool.fi",
-    "https://dytube.com",
     "https://tube.thierrytalbert.fr",
     "https://peertube.informaction.info",
     "https://tube.ac-amiens.fr",
     "https://tube.alado.space",
     "https://tube.network.europa.eu",
-    "https://vnchich.com",
     "https://pt.maciej.website",
     "https://peertube.frontmediatique.fr",
     "https://peertube.bgzashtita.es",
@@ -966,7 +971,6 @@
     "https://pierre.tube",
     "https://mirametube.fr",
     "https://vidz.dou.bet",
-    "https://videos.redeyes.site",
     "https://video.hostpath.de",
     "https://free-streams.com",
     "https://tube.pawelko.net",
@@ -1127,7 +1131,6 @@
     "https://www.orion-hub.fr",
     "https://tv.orion-serv.fr",
     "https://video.interru.io",
-    "https://tube.cnr.it",
     "https://peertube.dtmf.ca",
     "https://tube.ponsonaille.fr",
     "https://tube.int5.net",
@@ -1146,7 +1149,6 @@
     "https://vtr.chikichiki.tube",
     "https://fedimovie.com",
     "https://tube.doctors4covidethics.org",
-    "https://yoba.tv",
     "https://tube.mediainformationcenter.de",
     "https://peertube.communecter.org",
     "https://queermotion.org",
@@ -1408,7 +1410,6 @@
     "https://videos.john-livingston.fr",
     "https://melsungen.peertube-host.de",
     "https://evangelisch.video",
-    "https://tube.anufrij.de",
     "https://videos.mastodont.cat",
     "https://media.undeadnetwork.de",
     "https://tube.dragonpsi.xyz",
@@ -1460,7 +1461,6 @@
     "https://kodcast.com",
     "https://video.altertek.org",
     "https://ruraletv.ovh",
-    "https://videos.weblib.re",
     "https://tube.oisux.org",
     "https://peertube.louisematic.site",
     "https://clap.nerv-project.eu",
@@ -1501,14 +1501,12 @@
     "https://tube.nox-rhea.org",
     "https://peertube.securitymadein.lu",
     "https://tube.rita.moe",
-    "https://tuktube.com",
     "https://mytube.kn-cloud.de",
     "https://tube.nuagelibre.fr",
     "https://video.nogafam.es",
     "https://peertube.stream",
     "https://videos.leslionsfloorball.fr",
     "https://player.ojamajo.moe",
-    "https://ftsi.ru",
     "https://video.cigliola.com",
     "https://xxx.noho.st",
     "https://peertube.stefofficiel.me",
-- 
cgit 1.4.1


From cd01a7083ced7f53c4d87e604f4edadce64ca49e Mon Sep 17 00:00:00 2001
From: Hygna <hygna@proton.me>
Date: Tue, 4 Oct 2022 21:45:39 +0100
Subject: Added LibreTranslate

---
 src/assets/javascripts/services.js |  5 ++
 src/config/config.json             |  4 ++
 src/instances/blacklist.json       |  3 ++
 src/instances/data.json            | 34 +++++++++----
 src/instances/get_instances.py     |  7 ++-
 src/pages/background/background.js | 11 -----
 src/pages/options/index.html       | 97 ++++++++++++++++++++++++++++++++++++++
 7 files changed, 141 insertions(+), 20 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js
index eed1e6c6..572a6a9c 100644
--- a/src/assets/javascripts/services.js
+++ b/src/assets/javascripts/services.js
@@ -163,6 +163,11 @@ function redirect(url, type, initiator) {
 			return `freetube://https://youtu.be${url.pathname}${url.search}`.replace(/watch\?v=/, "")
 		case "simplyTranslate":
 			return `${randomInstance}/${url.search}`
+		case "libreTranslate":
+			return `${randomInstance}/${url.search}`
+				.replace(/(?<=\/?)sl/, "source")
+				.replace(/(?<=&)tl/, "target")
+				.replace(/(?<=&)text/, "q")
 		case "osm": {
 			if (initiator && initiator.host === "earth.google.com") return
 			const travelModes = {
diff --git a/src/config/config.json b/src/config/config.json
index 09c95bbb..fde17a02 100644
--- a/src/config/config.json
+++ b/src/config/config.json
@@ -496,6 +496,10 @@
 					},
 					"name": "Lingva Translate",
 					"instanceList": true
+				},
+				"libreTranslate": {
+					"name": "LibreTranslate",
+					"instanceList": true
 				}
 			},
 			"targets": ["^https?:\\/{2}translate\\.google(\\.[a-z]{2,3}){1,2}\\/", "^https?:\\/{2}translate\\.libredirect\\.invalid"],
diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index edce1958..90febd0a 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -53,6 +53,7 @@
     "https://scribe.rawbit.ninja",
     "https://lingva.garudalinux.org",
     "https://translate.dr460nf1r3.org",
+    "https://libretranslate.com",
     "https://searx.run",
     "https://searx.org",
     "https://search.garudalinux.org",
@@ -77,11 +78,13 @@
     "https://libreddit.notyourcomputer.net",
     "https://teddit.ggc-project.de",
     "https://teddit.tokhmi.xyz",
+    "https://wiki.privacytools.io",
     "https://quetre.odyssey346.dev",
     "https://st.odyssey346.dev",
     "https://jsearch.pw",
     "https://searx.gnu.style",
     "https://searx.semipvt.com",
+    "https://searx.tyil.nl",
     "https://etsi.me",
     "https://search.zzls.xyz",
     "https://searx.ericaftereric.top",
diff --git a/src/instances/data.json b/src/instances/data.json
index 839b155b..fac7962d 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -6,9 +6,11 @@
       "https://invidious.snopyta.org",
       "https://invidious.kavin.rocks",
       "https://inv.riverside.rocks",
+      "https://invidio.xamh.de",
       "https://y.com.sb",
       "https://yt.artemislena.eu",
       "https://invidious.tiekoetter.com",
+      "https://invidious.sethforprivacy.com",
       "https://invidious.flokinet.to",
       "https://inv.bp.projectsegfau.lt",
       "https://inv.vern.cc",
@@ -19,13 +21,11 @@
       "https://invidious.slipfox.xyz",
       "https://invidious.esmailelbob.xyz",
       "https://youtube.076.ne.jp",
-      "https://invidious.sethforprivacy.com",
-      "https://invidious.namazso.eu",
-      "https://invidio.xamh.de"
+      "https://invidious.namazso.eu"
     ],
     "tor": [
+      "http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion",
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
-      "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion",
       "http://grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad.onion",
       "http://osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion",
       "http://u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad.onion",
@@ -34,7 +34,7 @@
       "http://inv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
       "http://am74vkcrjp2d5v36lcdqgsj2m6x36tbrkhsruoegwfcizzabnfgf5zyd.onion",
       "http://ng27owmagn5amdm7l5s3rsqxwscl5ynppnis5dqcasogkyxcfqn7psid.onion",
-      "http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion"
+      "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion"
     ],
     "i2p": [],
     "loki": []
@@ -535,6 +535,24 @@
     "i2p": [],
     "loki": []
   },
+  "libreTranslate": {
+    "clearnet": [
+      "https://libretranslate.com",
+      "https://libretranslate.de",
+      "https://translate.argosopentech.com",
+      "https://translate.api.skitzen.com",
+      "https://translate.fortytwo-it.com",
+      "https://translate.terraprint.co",
+      "https://lt.vern.cc"
+    ],
+    "tor": [
+      "http://lt.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
+    ],
+    "i2p": [
+      "http://vernf45n7mxwqnp5riaax7p67pwcl7wcefdcnqqvim7ckdx4264a.b32.i2p"
+    ],
+    "loki": []
+  },
   "searx": {
     "clearnet": [
       "https://dynabyte.ca",
@@ -572,12 +590,10 @@
       "https://suche.uferwerk.org",
       "https://sx.catgirl.cloud",
       "https://timdor.noip.me/searx",
-      "https://xo.wtf",
       "https://searx.roflcopter.fr"
     ],
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
-      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
@@ -667,9 +683,11 @@
       "https://trydex.tk/searxng",
       "https://www.gruble.de",
       "https://www.webrats.xyz",
-      "https://xcxc.ml"
+      "https://xcxc.ml",
+      "https://xo.wtf"
     ],
     "tor": [
+      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
       "http://privateoz3u5utrimal2edr56j3r5caakektxxgixigdkycuxigvquid.onion",
       "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py
index 96902feb..9fc64adc 100644
--- a/src/instances/get_instances.py
+++ b/src/instances/get_instances.py
@@ -309,7 +309,7 @@ def bibliogram():
 
 
 def libreddit():
-    fetchRegexList('libreddit', 'Libreddit', 'https://raw.githubusercontent.com/spikecodes/libreddit/master/README.md', r"\| \[.*\]\(([-a-zA-Z0-9@:%_\+.~#?&//=]{2,}\.[a-z]{2,}\b(?:\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?)\)*\|*[A-Z]{0,}.*\|.*\|")
+    fetchJsonList('libreddit', 'Libreddit', 'https://github.com/libbacon/libreddit-instances/raw/master/instances.json', {'clearnet': 'url', 'tor': 'onion', 'i2p': 'i2p', 'loki': None}, True)
 
 
 def teddit():
@@ -433,6 +433,10 @@ def facil():
     fetchFromFile('facil', 'FacilMap')
 
 
+def libreTranslate():
+    fetchRegexList('libreTranslate', 'LibreTranslate', 'https://raw.githubusercontent.com/LibreTranslate/LibreTranslate/main/README.md', r"\[(?:[^\s\/]+\.)+[a-zA-Z0-9]+\]\((https?:\/{2}(?:[^\s\/]+\.)+[a-zA-Z0-9]+)\/?\)\|")
+
+
 def peertube():
     r = requests.get(
         'https://instances.joinpeertube.org/api/v1/instances?start=0&count=1045&sort=-createdAt')
@@ -470,6 +474,7 @@ quetre()
 libremdb()
 simplytranslate()
 linvgatranslate()
+libreTranslate()
 searx_searxng()
 whoogle()
 librex()
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index cad08580..e8d0fd76 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -20,17 +20,6 @@ function initDefaults() {
 }
 
 browser.runtime.onInstalled.addListener(details => {
-	// if (details.reason == 'install' || (details.reason == "update" && details.previousVersion != browser.runtime.getManifest().version)) {
-	//   if (details.reason == "update")
-	//     browser.storage.local.get(null, r => {
-	//       if (r.theme) {
-	//         const old = encodeURIComponent(JSON.stringify(r))
-	//         browser.tabs.create({ url: browser.runtime.getURL(`/pages/background/reset_warning.html?data=${old}`) });
-	//       }
-	//       initDefaults();
-	//     })
-	//   else initDefaults();
-	// }
 	switch (details.reason) {
 		case "install":
 			initDefaults()
diff --git a/src/pages/options/index.html b/src/pages/options/index.html
index 53ee562e..323984ed 100644
--- a/src/pages/options/index.html
+++ b/src/pages/options/index.html
@@ -2863,6 +2863,7 @@
     <select id="translate-frontend">
             <option value="simplyTranslate">SimplyTranslate</option>
             <option value="lingva">Lingva Translate</option>
+            <option value="libreTranslate">LibreTranslate</option>
       
     </select>
   </div>
@@ -3058,6 +3059,102 @@
       <div class="checklist custom-checklist"></div>
           </div>
     
+  </div>
+        <div id="libreTranslate">
+        <div class="clearnet">
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_defaultInstances__">Default Instances</h4>
+      </div>
+      <div class="checklist"></div>
+      <hr>
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_customInstances__">Custom Instances</h4>
+      </div>
+      <form class="custom-instance-form">
+        <div class="some-block option-block">
+          <input class="custom-instance" placeholder="http://libreTranslate.org" type="url">
+          <button class="add add-instance" type="submit">
+            <svg xmlns="https://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
+              <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path>
+            </svg>
+          </button>
+        </div>
+      </form>
+      <div class="checklist custom-checklist"></div>
+            <div class="buttons buttons-inline">
+        <label class="button button-inline" id="latency-libreTranslate-label" for="latency-libreTranslate"> 
+          <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+            <path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"></path>
+          </svg>&nbsp;
+          <x data-localise="__MSG_testInstancesLatency__">Test Instances Latency</x>
+        </label>
+        <input class="button button-inline" id="latency-libreTranslate" style="display:none;">
+      </div>
+          </div>
+        <div class="tor">
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_defaultInstances__">Default Instances</h4>
+      </div>
+      <div class="checklist"></div>
+      <hr>
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_customInstances__">Custom Instances</h4>
+      </div>
+      <form class="custom-instance-form">
+        <div class="some-block option-block">
+          <input class="custom-instance" placeholder="http://libreTranslate.onion" type="url">
+          <button class="add add-instance" type="submit">
+            <svg xmlns="https://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
+              <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path>
+            </svg>
+          </button>
+        </div>
+      </form>
+      <div class="checklist custom-checklist"></div>
+          </div>
+        <div class="i2p">
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_defaultInstances__">Default Instances</h4>
+      </div>
+      <div class="checklist"></div>
+      <hr>
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_customInstances__">Custom Instances</h4>
+      </div>
+      <form class="custom-instance-form">
+        <div class="some-block option-block">
+          <input class="custom-instance" placeholder="http://libreTranslate.i2p" type="url">
+          <button class="add add-instance" type="submit">
+            <svg xmlns="https://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
+              <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path>
+            </svg>
+          </button>
+        </div>
+      </form>
+      <div class="checklist custom-checklist"></div>
+          </div>
+        <div class="loki">
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_defaultInstances__">Default Instances</h4>
+      </div>
+      <div class="checklist"></div>
+      <hr>
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_customInstances__">Custom Instances</h4>
+      </div>
+      <form class="custom-instance-form">
+        <div class="some-block option-block">
+          <input class="custom-instance" placeholder="http://libreTranslate.loki" type="url">
+          <button class="add add-instance" type="submit">
+            <svg xmlns="https://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
+              <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path>
+            </svg>
+          </button>
+        </div>
+      </form>
+      <div class="checklist custom-checklist"></div>
+          </div>
+    
   </div>
     
 </section>
-- 
cgit 1.4.1


From a96f3188b7eac79f19f2bd438b13a310d3cea90b Mon Sep 17 00:00:00 2001
From: Hygna <hygna@proton.me>
Date: Wed, 5 Oct 2022 17:29:27 +0100
Subject: Changes:

Added BreezeWiki as a frontend for Fandom

Closes https://github.com/libredirect/libredirect/issues/444

Futureproofed bug caused by adding new frontend/service
---
 src/assets/images/fandom-icon.svg  |   1 +
 src/assets/javascripts/services.js |  56 +++++++++++++++++
 src/config/config.json             |  14 +++++
 src/instances/blacklist.json       |  23 ++-----
 src/instances/data.json            | 115 ++++++++---------------------------
 src/instances/get_instances.py     |   5 ++
 src/pages/background/background.js |   3 +
 src/pages/options/index.html       | 120 +++++++++++++++++++++++++++++++++++++
 src/pages/popup/popup.html         |  10 ++++
 9 files changed, 238 insertions(+), 109 deletions(-)
 create mode 100644 src/assets/images/fandom-icon.svg

(limited to 'src/instances/data.json')

diff --git a/src/assets/images/fandom-icon.svg b/src/assets/images/fandom-icon.svg
new file mode 100644
index 00000000..0cd873bf
--- /dev/null
+++ b/src/assets/images/fandom-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="wds-brand-fandom-logomark" viewBox="0 0 174 242"><path fill="#FA005A" d="M166.935 118.154L50.108 1.273C49.504.67 48.735.259 47.898.093c-.837-.166-1.705-.08-2.493.247-.788.327-1.461.88-1.935 1.59-.474.71-.727 1.546-.727 2.4v98.276L7.365 67.22c-.604-.604-1.373-1.014-2.21-1.18-.837-.166-1.704-.08-2.492.247-.789.327-1.462.88-1.936 1.59-.474.71-.727 1.545-.727 2.4v101.487c-.003 3.172.62 6.312 1.833 9.242 1.214 2.929 2.993 5.59 5.237 7.83l46.037 46.099c4.528 4.53 10.666 7.078 17.068 7.085h33.68c6.4-.003 12.537-2.547 17.063-7.075l46.027-46.099c2.239-2.242 4.014-4.904 5.225-7.833 1.21-2.93 1.832-6.069 1.83-9.239v-36.533c.002-3.173-.621-6.315-1.834-9.247-1.212-2.932-2.989-5.596-5.231-7.84z"/><path fill="#FFC500" d="M131.297 160.901c.001 1.915-.757 3.754-2.108 5.111l-37.11 37.3c-.672.677-1.472 1.215-2.354 1.582-.88.366-1.826.555-2.78.555-.954 0-1.9-.189-2.78-.555-.882-.367-1.682-.905-2.355-1.582l-36.99-37.3c-1.352-1.351-2.114-3.184-2.117-5.096v-14.191c0-.951.19-1.892.554-2.77.366-.878.9-1.675 1.574-2.346l13.317-13.328c.672-.675 1.47-1.209 2.35-1.574.879-.365 1.82-.553 2.772-.553.952 0 1.894.188 2.773.553.879.365 1.677.899 2.35 1.574l18.624 18.645 18.596-18.65c.672-.675 1.47-1.209 2.349-1.574.879-.365 1.821-.553 2.773-.553.951 0 1.893.188 2.772.553.879.365 1.677.899 2.349 1.574l13.318 13.328c.673.671 1.207 1.469 1.571 2.347.364.877.552 1.819.552 2.769v14.181z"/></svg>
\ No newline at end of file
diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js
index 572a6a9c..d7cb520b 100644
--- a/src/assets/javascripts/services.js
+++ b/src/assets/javascripts/services.js
@@ -386,6 +386,11 @@ function redirect(url, type, initiator) {
 				return `${randomInstance}/${params.sl}/${params.tl}/${params.text}`
 			}
 			return randomInstance
+		case "breezeWiki":
+			let wiki = url.hostname.match(/^[a-zA-Z0-9]+(?=\.fandom\.com)/)
+			if (wiki == "www" || !wiki) wiki = ""
+			else wiki = "/" + wiki
+			return `${randomInstance}${wiki}${url.pathname}${url.search}`.replace(/Special:Search\?query/, "search?q")
 		default:
 			return `${randomInstance}${url.pathname}${url.search}`
 	}
@@ -685,6 +690,56 @@ function upgradeOptions() {
 	})
 }
 
+function processUpdate() {
+	return new Promise(resolve => {
+		fetch("/instances/data.json")
+			.then(response => response.text())
+			.then(data => {
+				fetch("/config/config.json")
+					.then(response => response.text())
+					.then(configData => {
+						browser.storage.local.get(["options", "blacklists", "targets"], r => {
+							let redirects = JSON.parse(data)
+							let options = r.options
+							let targets = r.targets
+							let config = JSON.parse(configData)
+							for (const service in config.services) {
+								if (!options[service]) {
+									options[service] = {}
+									if (config.services[service].targets == "datajson") {
+										targets[service] = redirects[service]
+									}
+									for (const defaultOption in config.services[service].options) {
+										options[service][defaultOption] = config.services[service].options[defaultOption]
+									}
+								}
+								for (const frontend in config.services[service].frontends) {
+									if (!options[service][frontend]) {
+										if (config.services[service].frontends[frontend].instanceList) {
+											options[frontend] = {}
+											for (const network in config.networks) {
+												options[frontend][network] = {}
+												options[frontend][network].enabled = JSON.parse(data)[frontend][network]
+												options[frontend][network].custom = []
+											}
+											for (const blacklist in r.blacklists) {
+												for (const instance of r.blacklists[blacklist]) {
+													let i = options[frontend].clearnet.enabled.indexOf(instance)
+													if (i > -1) options[frontend].clearnet.enabled.splice(i, 1)
+												}
+											}
+										}
+									}
+								}
+							}
+							browser.storage.local.set({ redirects, options, targets })
+							resolve()
+						})
+					})
+			})
+	})
+}
+
 export default {
 	redirect,
 	computeService,
@@ -694,4 +749,5 @@ export default {
 	setRedirects,
 	initDefaults,
 	upgradeOptions,
+	processUpdate,
 }
diff --git a/src/config/config.json b/src/config/config.json
index fde17a02..61195830 100644
--- a/src/config/config.json
+++ b/src/config/config.json
@@ -362,6 +362,20 @@
 			"embeddable": false,
 			"url": "https://reuters.com"
 		},
+		"fandom": {
+			"frontends": {
+				"breezeWiki": {
+					"name": "BreezeWiki",
+					"instanceList": true
+				}
+			},
+			"targets": ["^https?:\\/{2}(?:[a-zA-Z0-9]+\\.)?fandom\\.com(?=(?:\\/wiki)|(?:\\/?$))"],
+			"name": "Fandom",
+			"options": { "enabled": true },
+			"imageType": "svg",
+			"embeddable": false,
+			"url": "https://fandom.com"
+		},
 		"peertube": {
 			"frontends": {
 				"simpleertube": {
diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 90febd0a..d75c36d8 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -28,18 +28,6 @@
     "https://n.sneed.network",
     "https://nitter.twei.space",
     "https://nitter.d420.de",
-    "https://libreddit.domain.glass",
-    "https://r.nf",
-    "https://libreddit.hu",
-    "https://lr.stilic.ml",
-    "https://reddi.tk",
-    "https://r.walkx.org",
-    "https://libreddit.yonalee.eu",
-    "https://libreddit.winscloud.net",
-    "https://r.ahwx.org",
-    "https://reddit.dr460nf1r3.org",
-    "https://libreddit.encrypted-data.xyz",
-    "https://libreddit.eu.org",
     "https://teddit.domain.glass",
     "https://teddit.httpjames.space",
     "https://teddit.encrypted-data.xyz",
@@ -73,18 +61,14 @@
     "https://nhanh.cloud",
     "https://nitter.winscloud.net",
     "https://ntr.odyssey346.dev",
-    "https://libreddit.yonalee.eu",
-    "https://libreddit.winscloud.net",
-    "https://libreddit.notyourcomputer.net",
     "https://teddit.ggc-project.de",
     "https://teddit.tokhmi.xyz",
-    "https://wiki.privacytools.io",
     "https://quetre.odyssey346.dev",
+    "https://simplytranslate.org",
     "https://st.odyssey346.dev",
     "https://jsearch.pw",
     "https://searx.gnu.style",
     "https://searx.semipvt.com",
-    "https://searx.tyil.nl",
     "https://etsi.me",
     "https://search.zzls.xyz",
     "https://searx.ericaftereric.top",
@@ -93,7 +77,10 @@
     "https://whoogle.esmailelbob.xyz",
     "https://search.wef.lol",
     "https://i.bcow.xyz",
+    "https://rimgo.totaldarkness.net",
+    "https://imgur.artemislena.eu",
     "https://lbry.bcow.xyz",
-    "https://beatbump.ml"
+    "https://beatbump.ml",
+    "https://bw.odyssey346.dev"
   ]
 }
\ No newline at end of file
diff --git a/src/instances/data.json b/src/instances/data.json
index fac7962d..eaefc4ed 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -13,19 +13,20 @@
       "https://invidious.sethforprivacy.com",
       "https://invidious.flokinet.to",
       "https://inv.bp.projectsegfau.lt",
-      "https://inv.vern.cc",
       "https://invidious.nerdvpn.de",
       "https://invidious.projectsegfau.lt",
       "https://invidious.rhyshl.live",
       "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
-      "https://invidious.esmailelbob.xyz",
       "https://youtube.076.ne.jp",
+      "https://invidious.esmailelbob.xyz",
+      "https://inv.vern.cc",
       "https://invidious.namazso.eu"
     ],
     "tor": [
-      "http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion",
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
+      "http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion",
+      "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion",
       "http://grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad.onion",
       "http://osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion",
       "http://u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad.onion",
@@ -33,8 +34,7 @@
       "http://invidious.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://inv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
       "http://am74vkcrjp2d5v36lcdqgsj2m6x36tbrkhsruoegwfcizzabnfgf5zyd.onion",
-      "http://ng27owmagn5amdm7l5s3rsqxwscl5ynppnis5dqcasogkyxcfqn7psid.onion",
-      "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion"
+      "http://ng27owmagn5amdm7l5s3rsqxwscl5ynppnis5dqcasogkyxcfqn7psid.onion"
     ],
     "i2p": [],
     "loki": []
@@ -51,9 +51,7 @@
       "https://piped.garudalinux.org",
       "https://y.rivo.lol",
       "https://yt.jae.fi",
-      "https://piped.mint.lgbt",
       "https://il.ax",
-      "https://piped.esmailelbob.xyz",
       "https://piped.projectsegfau.lt",
       "https://piped.privacydev.net",
       "https://piped.smnz.de",
@@ -208,7 +206,8 @@
       "https://nitter.caioalonso.com",
       "https://nitter.at",
       "https://nitter.drivet.xyz",
-      "https://nitter.pw"
+      "https://nitter.pw",
+      "https://nitter.nicfab.eu"
     ],
     "tor": [
       "http://nitter7bryz3jv7e3uekphigvmoyoem4al3fynerxkj22dmoxoq553qd.onion",
@@ -261,87 +260,8 @@
     "loki": []
   },
   "libreddit": {
-    "clearnet": [
-      "https://libredd.it",
-      "https://libreddit.spike.codes",
-      "https://libreddit.dothq.co",
-      "https://libreddit.kavin.rocks",
-      "https://reddit.invak.id",
-      "https://reddit.phii.me",
-      "https://lr.riverside.rocks",
-      "https://libreddit.strongthany.cc",
-      "https://libreddit.database.red",
-      "https://libreddit.privacy.com.de",
-      "https://libreddit.domain.glass",
-      "https://libreddit.sugoma.tk",
-      "https://libreddit.jamiethalacker.dev",
-      "https://reddit.artemislena.eu",
-      "https://r.nf",
-      "https://libreddit.some-things.org",
-      "https://reddit.stuehieyr.com",
-      "https://lr.mint.lgbt",
-      "https://libreddit.igna.rocks",
-      "https://libreddit.autarkic.org",
-      "https://libreddit.flux.industries",
-      "https://libreddit.drivet.xyz",
-      "https://lr.oversold.host",
-      "https://libreddit.de",
-      "https://libreddit.pussthecat.org",
-      "https://libreddit.mutahar.rocks",
-      "https://libreddit.northboot.xyz",
-      "https://leddit.xyz",
-      "https://de.leddit.xyz",
-      "https://lr.cowfee.moe",
-      "https://libreddit.hu",
-      "https://libreddit.totaldarkness.net",
-      "https://libreddit.esmailelbob.xyz",
-      "https://lr.vern.cc",
-      "https://libreddit.nl",
-      "https://lr.stilic.ml",
-      "https://reddi.tk",
-      "https://libreddit.bus-hit.me",
-      "https://libreddit.datatunnel.xyz",
-      "https://libreddit.crewz.me",
-      "https://r.walkx.org",
-      "https://libreddit.kylrth.com",
-      "https://libreddit.yonalee.eu",
-      "https://libreddit.winscloud.net",
-      "https://libreddit.tiekoetter.com",
-      "https://reddit.rtrace.io",
-      "https://libreddit.lunar.icu",
-      "https://libreddit.privacydev.net",
-      "https://libreddit.notyourcomputer.net",
-      "https://r.ahwx.org",
-      "https://bob.fr.to",
-      "https://reddit.beparanoid.de",
-      "https://libreddit.dcs0.hu",
-      "https://reddit.dr460nf1r3.org",
-      "https://rd.jae.su",
-      "https://libreddit.mha.fi",
-      "https://libreddit.foss.wtf",
-      "https://libreddit.encrypted-data.xyz",
-      "https://libreddit.eu.org",
-      "https://l.opnxng.com"
-    ],
-    "tor": [
-      "http://spjmllawtheisznfs7uryhxumin26ssv2draj7oope3ok3wuhy43eoyd.onion",
-      "http://fwhhsbrbltmrct5hshrnqlqygqvcgmnek3cnka55zj4y7nuus5muwyyd.onion",
-      "http://kphht2jcflojtqte4b4kyx7p2ahagv4debjj32nre67dxz7y57seqwyd.onion",
-      "http://inytumdgnri7xsqtvpntjevaelxtgbjqkuqhtf6txxhwbll2fwqtakqd.onion",
-      "http://liredejj74h5xjqr2dylnl5howb2bpikfowqoveub55ru27x43357iid.onion",
-      "http://kzhfp3nvb4qp575vy23ccbrgfocezjtl5dx66uthgrhu7nscu6rcwjyd.onion",
-      "http://ecue64ybzvn6vjzl37kcsnwt4ycmbsyf74nbttyg7rkc3t3qwnj7mcyd.onion",
-      "http://ledditqo2mxfvlgobxnlhrkq4dh34jss6evfkdkb2thlvy6dn4f4gpyd.onion",
-      "http://libredoxhxwnmsb6dvzzd35hmgzmawsq5i764es7witwhddvpc2razid.onion",
-      "http://libreddit.2syis2nnyytz6jnusnjurva4swlaizlnleiks5mjp46phuwjbdjqwgqd.onion",
-      "http://ol5begilptoou34emq2sshf3may3hlblvipdjtybbovpb7c7zodxmtqd.onion",
-      "http://lbrdtjaj7567ptdd4rv74lv27qhxfkraabnyphgcvptl64ijx2tijwid.onion",
-      "http://libreddit.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
-      "http://reddit.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion",
-      "http://inz6tbezfwzexva6dize4cqraj2tjdhygxabmcgysccesvw2pybzhbyd.onion",
-      "http://libreddit.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
-      "http://lr.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
-    ],
+    "clearnet": [],
+    "tor": [],
     "i2p": [],
     "loki": []
   },
@@ -596,8 +516,10 @@
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
+      "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
       "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
+      "http://searx.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
     ],
     "i2p": [
@@ -694,8 +616,6 @@
       "http://searxngg6zleq6ceboe5ltkyo4hyrb3aaycrgzmrljv3jjlb5vcytead.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://b2c7fvbhnfvwnl6oh2tydhzfx4i37kmmrycq42heqbbe7wovq3uzenid.onion",
-      "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
-      "http://searx.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://searxfilowxokbogygrigir4wqxfxqzuxofxgdon7dg6rsii4yxzytyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
@@ -829,8 +749,21 @@
     "i2p": [],
     "loki": []
   },
+  "breezeWiki": {
+    "clearnet": [
+      "https://breezewiki.com",
+      "https://breezewiki.pussthecat.org",
+      "https://bw.odyssey346.dev",
+      "https://bw.vern.cc",
+      "https://breezewiki.esmailelbob.xyz"
+    ],
+    "tor": [],
+    "i2p": [],
+    "loki": []
+  },
   "peertube": [
     "https://search.joinpeertube.org",
+    "https://freedomadultgames.video",
     "https://tbh.co-shaoghal.net",
     "https://tube.kansanvalta.org",
     "https://duanrra.cf",
diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py
index 9fc64adc..fc730cf6 100644
--- a/src/instances/get_instances.py
+++ b/src/instances/get_instances.py
@@ -437,6 +437,10 @@ def libreTranslate():
     fetchRegexList('libreTranslate', 'LibreTranslate', 'https://raw.githubusercontent.com/LibreTranslate/LibreTranslate/main/README.md', r"\[(?:[^\s\/]+\.)+[a-zA-Z0-9]+\]\((https?:\/{2}(?:[^\s\/]+\.)+[a-zA-Z0-9]+)\/?\)\|")
 
 
+def breezeWiki():
+    fetchRegexList('breezeWiki', 'BreezeWiki', 'https://gitdab.com/cadence/breezewiki-docs/raw/branch/main/docs.scrbl', r"\(\"[^\n\s\r\t\f\v\"]+\" \"https?:\/{2}(?:[^\s\/]+\.)+[a-zA-Z0-9]+(?:\/[^\s\/]+)*\" \"(https?:\/{2}(?:[^\s\/]+\.)+[a-zA-Z0-9]+(?:\/[^\s\/]+)*)\"\)")
+
+
 def peertube():
     r = requests.get(
         'https://instances.joinpeertube.org/api/v1/instances?start=0&count=1045&sort=-createdAt')
@@ -485,6 +489,7 @@ beatbump()
 hyperpipe()
 facil()
 simpleertube()
+breezeWiki()
 mightyList = filterLastSlash(mightyList)
 mightyList = idnaEncode(mightyList)
 
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index e8d0fd76..3f0e0fdd 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -30,11 +30,14 @@ browser.runtime.onInstalled.addListener(details => {
 				.then(async data => {
 					browser.storage.local.set({ blacklists: JSON.parse(data) }, async () => {
 						switch (details.previousVersion) {
+							case "2.2.0":
 							case "2.2.1":
 								await generalHelper.initDefaults()
 								await servicesHelper.initDefaults()
 								await servicesHelper.upgradeOptions()
 								break
+							default:
+								await servicesHelper.processUpdate()
 						}
 					})
 				})
diff --git a/src/pages/options/index.html b/src/pages/options/index.html
index 323984ed..faeb5124 100644
--- a/src/pages/options/index.html
+++ b/src/pages/options/index.html
@@ -84,6 +84,11 @@
     <span data-localise="__MSG_reuters__">Reuters</span>
   </a></div>
     <div class="title">
+  <a href="#fandom">
+    <img src="../../../assets/images/fandom-icon.svg">
+    <span data-localise="__MSG_fandom__">Fandom</span>
+  </a></div>
+    <div class="title">
   <a href="#peertube">
     <img src="../../../assets/images/peertube-icon.svg">
     <span data-localise="__MSG_peertube__">PeerTube</span>
@@ -313,6 +318,13 @@
       <input id="reuters" type="checkbox">
     </div>
     <div>
+  <div>
+    <img src="../../../assets/images/fandom-icon.svg">
+    <label data-localise="__MSG_fandom__" for="fandom">Fandom</label>
+      </div>
+      <input id="fandom" type="checkbox">
+    </div>
+    <div>
   <div>
     <img src="../../../assets/images/peertube-icon.svg">
     <label data-localise="__MSG_peertube__" for="peertube">PeerTube</label>
@@ -2200,6 +2212,114 @@
     
   </div>
     
+</section>
+<section class="option-block" id="fandom_page">
+  <div class="some-block option-block">
+    <h1 data-localise="__MSG_fandom__">Fandom</h1>
+  </div>
+  <hr>
+  <div class="some-block option-block">
+    <h4 data-localise="__MSG_enable__">Enable</h4>
+    <input id="fandom-enabled" type="checkbox">
+  </div>
+      <hr>
+      <div id="breezeWiki">
+        <div class="clearnet">
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_defaultInstances__">Default Instances</h4>
+      </div>
+      <div class="checklist"></div>
+      <hr>
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_customInstances__">Custom Instances</h4>
+      </div>
+      <form class="custom-instance-form">
+        <div class="some-block option-block">
+          <input class="custom-instance" placeholder="http://breezeWiki.org" type="url">
+          <button class="add add-instance" type="submit">
+            <svg xmlns="https://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
+              <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path>
+            </svg>
+          </button>
+        </div>
+      </form>
+      <div class="checklist custom-checklist"></div>
+            <div class="buttons buttons-inline">
+        <label class="button button-inline" id="latency-breezeWiki-label" for="latency-breezeWiki"> 
+          <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+            <path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"></path>
+          </svg>&nbsp;
+          <x data-localise="__MSG_testInstancesLatency__">Test Instances Latency</x>
+        </label>
+        <input class="button button-inline" id="latency-breezeWiki" style="display:none;">
+      </div>
+          </div>
+        <div class="tor">
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_defaultInstances__">Default Instances</h4>
+      </div>
+      <div class="checklist"></div>
+      <hr>
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_customInstances__">Custom Instances</h4>
+      </div>
+      <form class="custom-instance-form">
+        <div class="some-block option-block">
+          <input class="custom-instance" placeholder="http://breezeWiki.onion" type="url">
+          <button class="add add-instance" type="submit">
+            <svg xmlns="https://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
+              <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path>
+            </svg>
+          </button>
+        </div>
+      </form>
+      <div class="checklist custom-checklist"></div>
+          </div>
+        <div class="i2p">
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_defaultInstances__">Default Instances</h4>
+      </div>
+      <div class="checklist"></div>
+      <hr>
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_customInstances__">Custom Instances</h4>
+      </div>
+      <form class="custom-instance-form">
+        <div class="some-block option-block">
+          <input class="custom-instance" placeholder="http://breezeWiki.i2p" type="url">
+          <button class="add add-instance" type="submit">
+            <svg xmlns="https://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
+              <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path>
+            </svg>
+          </button>
+        </div>
+      </form>
+      <div class="checklist custom-checklist"></div>
+          </div>
+        <div class="loki">
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_defaultInstances__">Default Instances</h4>
+      </div>
+      <div class="checklist"></div>
+      <hr>
+      <div class="some-block option-block">
+        <h4 data-localise="__MSG_customInstances__">Custom Instances</h4>
+      </div>
+      <form class="custom-instance-form">
+        <div class="some-block option-block">
+          <input class="custom-instance" placeholder="http://breezeWiki.loki" type="url">
+          <button class="add add-instance" type="submit">
+            <svg xmlns="https://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
+              <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path>
+            </svg>
+          </button>
+        </div>
+      </form>
+      <div class="checklist custom-checklist"></div>
+          </div>
+    
+  </div>
+    
 </section>
 <section class="option-block" id="peertube_page">
   <div class="some-block option-block">
diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html
index 54c4fefa..2dcc12bc 100644
--- a/src/pages/popup/popup.html
+++ b/src/pages/popup/popup.html
@@ -73,6 +73,11 @@
     <h4 data-localise="__MSG_reuters__">Reuters</h4></a>
   <input class="reuters-enabled" type="checkbox"/>
 </div>
+<div class="fandom some-block"><a class="title" href="https://fandom.com">
+    <img src="../../assets/images/fandom-icon.svg"/>
+    <h4 data-localise="__MSG_fandom__">Fandom</h4></a>
+  <input class="fandom-enabled" type="checkbox"/>
+</div>
 <div class="peertube some-block"><a class="title" href="https://search.joinpeertube.org">
     <img src="../../assets/images/peertube-icon.svg"/>
     <h4 data-localise="__MSG_peertube__">PeerTube</h4></a>
@@ -186,6 +191,11 @@
     <h4 data-localise="__MSG_reuters__">Reuters</h4></a>
   <input class="reuters-enabled" type="checkbox"/>
 </div>
+<div class="fandom some-block"><a class="title" href="https://fandom.com">
+    <img src="../../assets/images/fandom-icon.svg"/>
+    <h4 data-localise="__MSG_fandom__">Fandom</h4></a>
+  <input class="fandom-enabled" type="checkbox"/>
+</div>
 <div class="peertube some-block"><a class="title" href="https://search.joinpeertube.org">
     <img src="../../assets/images/peertube-icon.svg"/>
     <h4 data-localise="__MSG_peertube__">PeerTube</h4></a>
-- 
cgit 1.4.1


From 9d2b5c5877f4315457af45d9275f0dd8a452e062 Mon Sep 17 00:00:00 2001
From: Woodpecker CI <libredirect@noreply.codeberg.org>
Date: Fri, 7 Oct 2022 00:09:41 +0000
Subject: updated instances

---
 src/instances/blacklist.json |  19 ++++++--
 src/instances/data.json      | 104 +++++++++++++++++++++++++++++++++----------
 2 files changed, 95 insertions(+), 28 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index d75c36d8..992466d1 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -3,13 +3,11 @@
     "https://invidious.kavin.rocks",
     "https://invidious.rhyshl.live",
     "https://piped.kavin.rocks",
-    "https://piped.tokhmi.xyz",
     "https://piped.moomoo.me",
     "https://piped.mha.fi",
     "https://de-piped.shimul.me",
     "https://pipedus.palash.dev",
     "https://watch.whatever.social",
-    "https://piped.garudalinux.org",
     "https://y.rivo.lol",
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
@@ -28,6 +26,17 @@
     "https://n.sneed.network",
     "https://nitter.twei.space",
     "https://nitter.d420.de",
+    "https://libreddit.domain.glass",
+    "https://r.nf",
+    "https://libreddit.hu",
+    "https://reddi.tk",
+    "https://r.walkx.org",
+    "https://r.ahwx.org",
+    "https://reddit.dr460nf1r3.org",
+    "https://libreddit.encrypted-data.xyz",
+    "https://libreddit.eu.org",
+    "https://libreddit.cachyos.org",
+    "https://futureddit.gq",
     "https://teddit.domain.glass",
     "https://teddit.httpjames.space",
     "https://teddit.encrypted-data.xyz",
@@ -57,6 +66,7 @@
   ],
   "offline": [
     "https://invidious.rhyshl.live",
+    "https://invidious.esmailelbob.xyz",
     "https://proxitok.odyssey346.dev",
     "https://nhanh.cloud",
     "https://nitter.winscloud.net",
@@ -65,6 +75,7 @@
     "https://teddit.tokhmi.xyz",
     "https://quetre.odyssey346.dev",
     "https://simplytranslate.org",
+    "https://translate.northboot.xyz",
     "https://st.odyssey346.dev",
     "https://jsearch.pw",
     "https://searx.gnu.style",
@@ -74,11 +85,11 @@
     "https://searx.ericaftereric.top",
     "https://searx.fmac.xyz",
     "https://www.webrats.xyz",
+    "https://gowogle.voring.me",
     "https://whoogle.esmailelbob.xyz",
     "https://search.wef.lol",
     "https://i.bcow.xyz",
-    "https://rimgo.totaldarkness.net",
-    "https://imgur.artemislena.eu",
+    "https://i.actionsack.com",
     "https://lbry.bcow.xyz",
     "https://beatbump.ml",
     "https://bw.odyssey346.dev"
diff --git a/src/instances/data.json b/src/instances/data.json
index eaefc4ed..cbff9aac 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -9,24 +9,23 @@
       "https://invidio.xamh.de",
       "https://y.com.sb",
       "https://yt.artemislena.eu",
-      "https://invidious.tiekoetter.com",
       "https://invidious.sethforprivacy.com",
+      "https://invidious.tiekoetter.com",
       "https://invidious.flokinet.to",
       "https://inv.bp.projectsegfau.lt",
+      "https://inv.vern.cc",
       "https://invidious.nerdvpn.de",
       "https://invidious.projectsegfau.lt",
       "https://invidious.rhyshl.live",
       "https://inv.privacy.com.de",
-      "https://invidious.slipfox.xyz",
-      "https://youtube.076.ne.jp",
       "https://invidious.esmailelbob.xyz",
-      "https://inv.vern.cc",
+      "https://youtube.076.ne.jp",
+      "https://invidious.slipfox.xyz",
       "https://invidious.namazso.eu"
     ],
     "tor": [
-      "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
       "http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion",
-      "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion",
+      "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
       "http://grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad.onion",
       "http://osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion",
       "http://u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad.onion",
@@ -34,7 +33,8 @@
       "http://invidious.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://inv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
       "http://am74vkcrjp2d5v36lcdqgsj2m6x36tbrkhsruoegwfcizzabnfgf5zyd.onion",
-      "http://ng27owmagn5amdm7l5s3rsqxwscl5ynppnis5dqcasogkyxcfqn7psid.onion"
+      "http://ng27owmagn5amdm7l5s3rsqxwscl5ynppnis5dqcasogkyxcfqn7psid.onion",
+      "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion"
     ],
     "i2p": [],
     "loki": []
@@ -42,18 +42,18 @@
   "piped": {
     "clearnet": [
       "https://piped.kavin.rocks",
-      "https://piped.tokhmi.xyz",
       "https://piped.moomoo.me",
       "https://piped.mha.fi",
       "https://de-piped.shimul.me",
       "https://pipedus.palash.dev",
       "https://watch.whatever.social",
-      "https://piped.garudalinux.org",
       "https://y.rivo.lol",
       "https://yt.jae.fi",
+      "https://piped.mint.lgbt",
       "https://il.ax",
       "https://piped.projectsegfau.lt",
       "https://piped.privacydev.net",
+      "https://piped.palveluntarjoaja.eu",
       "https://piped.smnz.de",
       "https://piped.adminforge.de",
       "https://watch.whatevertinfoil.de",
@@ -260,8 +260,55 @@
     "loki": []
   },
   "libreddit": {
-    "clearnet": [],
-    "tor": [],
+    "clearnet": [
+      "https://libreddit.spike.codes",
+      "https://libreddit.kavin.rocks",
+      "https://reddit.invak.id",
+      "https://lr.riverside.rocks",
+      "https://libreddit.strongthany.cc",
+      "https://libreddit.privacy.com.de",
+      "https://libreddit.domain.glass",
+      "https://r.nf",
+      "https://reddit.stuehieyr.com",
+      "https://lr.mint.lgbt",
+      "https://libreddit.drivet.xyz",
+      "https://libreddit.de",
+      "https://libreddit.pussthecat.org",
+      "https://libreddit.northboot.xyz",
+      "https://leddit.xyz",
+      "https://libreddit.hu",
+      "https://libreddit.totaldarkness.net",
+      "https://libreddit.esmailelbob.xyz",
+      "https://lr.vern.cc",
+      "https://libreddit.nl",
+      "https://reddi.tk",
+      "https://r.walkx.org",
+      "https://libreddit.kylrth.com",
+      "https://libreddit.tiekoetter.com",
+      "https://reddit.rtrace.io",
+      "https://libreddit.privacydev.net",
+      "https://r.ahwx.org",
+      "https://bob.fr.to",
+      "https://libreddit.dcs0.hu",
+      "https://reddit.dr460nf1r3.org",
+      "https://rd.jae.su",
+      "https://libreddit.foss.wtf",
+      "https://libreddit.encrypted-data.xyz",
+      "https://libreddit.eu.org",
+      "https://l.opnxng.com",
+      "https://libreddit.cachyos.org",
+      "https://rd.funami.tech",
+      "https://libreddit.projectsegfau.lt",
+      "https://futureddit.gq",
+      "https://lr.slipfox.xyz",
+      "https://libreddit.oxymagnesium.com",
+      "https://reddit.utsav2.dev"
+    ],
+    "tor": [
+      "http://ecue64ybzvn6vjzl37kcsnwt4ycmbsyf74nbttyg7rkc3t3qwnj7mcyd.onion",
+      "http://libreddit.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
+      "http://ojwp2gtj7dq7scd7gnbac6wp53tklgsicteabrnx2pr7zai64wriiaad.onion"
+    ],
     "i2p": [],
     "loki": []
   },
@@ -271,7 +318,6 @@
       "https://teddit.ggc-project.de",
       "https://teddit.zaggy.nl",
       "https://teddit.namazso.eu",
-      "https://teddit.nautolan.racing",
       "https://teddit.tinfoil-hat.net",
       "https://teddit.domain.glass",
       "https://snoo.ioens.is",
@@ -311,7 +357,7 @@
     "i2p": [
       "http://xugoqcf2pftm76vbznx4xuhrzyb5b6zwpizpnw2hysexjdn5l2tq.b32.i2p",
       "http://teddit.i2p",
-      "https://codeberg.org/teddit/teddit/src/branch/main/vzeiwzi7ogwl3ijrfek4fbtwhvamxcpyqoc3s4vcgnhlp54s5clq.b32.i2p",
+      "http://vzeiwzi7ogwl3ijrfek4fbtwhvamxcpyqoc3s4vcgnhlp54s5clq.b32.i2p",
       "http://verncco2oaxjikammz4pi7umzp673cme6zuemx7yeeewspwrw3va.b32.i2p"
     ],
     "loki": []
@@ -516,11 +562,10 @@
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
-      "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
       "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
-      "http://searx.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
-      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
+      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
+      "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -616,8 +661,9 @@
       "http://searxngg6zleq6ceboe5ltkyo4hyrb3aaycrgzmrljv3jjlb5vcytead.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://b2c7fvbhnfvwnl6oh2tydhzfx4i37kmmrycq42heqbbe7wovq3uzenid.onion",
+      "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
+      "http://searx.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://searxfilowxokbogygrigir4wqxfxqzuxofxgdon7dg6rsii4yxzytyd.onion",
-      "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
       "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
       "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
@@ -648,9 +694,23 @@
     "loki": []
   },
   "librex": {
-    "clearnet": [],
-    "tor": [],
-    "i2p": [],
+    "clearnet": [
+      "https://librex.beparanoid.de",
+      "https://librex.extravi.dev",
+      "https://search.davidovski.xyz",
+      "https://librex.kitscomputer.tk",
+      "https://search.funami.tech",
+      "https://librex.catalyst.sx",
+      "https://search.madreyk.xyz",
+      "https://search.pabloferreiro.es"
+    ],
+    "tor": [
+      "http://librex.2356uhnbpv5nk3bni5bv6jg2cd6lgj664kwx3lhyelstpttpyv4kk2qd.onion",
+      "http://ncblhz7q4sfbf755bdbhebfzxcpypz7ewafgi4agatecojz7pln4i3id.onion"
+    ],
+    "i2p": [
+      "http://rra33hiaf6nmby7jfpqe2gqmng3jnzkvbu2n7jgce7vbhoyuhzya.b32.i2p"
+    ],
     "loki": []
   },
   "rimgo": {
@@ -821,7 +881,6 @@
     "https://tube.reseau-canope.fr",
     "https://frentube.myyouniverse.observer",
     "https://tube-maternelle.apps.education.fr",
-    "https://peertube.onionstorm.net",
     "https://dev.dollarvigilante.tv",
     "https://video.trankil.info",
     "https://video.uriopss-pdl.fr",
@@ -903,7 +962,6 @@
     "https://videos.tormentasolar.win",
     "https://tube.nestor.coop",
     "https://live.oldskool.fi",
-    "https://tube.thierrytalbert.fr",
     "https://peertube.informaction.info",
     "https://tube.ac-amiens.fr",
     "https://tube.alado.space",
@@ -950,7 +1008,6 @@
     "https://videos-passages.huma-num.fr",
     "https://video.linc.systems",
     "https://video.sftblw.moe",
-    "https://peertube.dsmouse.net",
     "https://ptube.horsentiers.fr",
     "https://video.cnt.social",
     "https://tube.03281.fspfc.org",
@@ -1339,7 +1396,6 @@
     "https://video.lespoesiesdheloise.fr",
     "https://peertube.luga.at",
     "https://peertube.roflcopter.fr",
-    "https://ptube.rousset.nom.fr",
     "https://peertube.swrs.net",
     "https://tube.shanti.cafe",
     "https://videos.cloudron.io",
-- 
cgit 1.4.1


From 96f6ca4c223c377debd2d1d5a1ffdd39979c2755 Mon Sep 17 00:00:00 2001
From: Hygna <hygna@proton.me>
Date: Sun, 9 Oct 2022 13:56:04 +0100
Subject: Updated instances

---
 src/config/config.json       |  2 +-
 src/instances/blacklist.json | 14 ++++++++------
 src/instances/data.json      | 41 ++++++++++++++++++-----------------------
 src/pages/popup/style.css    |  4 ++--
 4 files changed, 29 insertions(+), 32 deletions(-)

(limited to 'src/instances/data.json')

diff --git a/src/config/config.json b/src/config/config.json
index 8110748f..bb970525 100644
--- a/src/config/config.json
+++ b/src/config/config.json
@@ -397,7 +397,7 @@
 				}
 			},
 			"targets": [
-				"^https?:\\/{2}([a-z]+\\.)*quora\\.com.*"
+				"^https?:\\/{2}([a-z]+\\.)*quora\\.com"
 			],
 			"name": "Quora",
 			"options": {
diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 992466d1..8bf43ebf 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -3,11 +3,12 @@
     "https://invidious.kavin.rocks",
     "https://invidious.rhyshl.live",
     "https://piped.kavin.rocks",
+    "https://piped.tokhmi.xyz",
     "https://piped.moomoo.me",
     "https://piped.mha.fi",
     "https://de-piped.shimul.me",
-    "https://pipedus.palash.dev",
     "https://watch.whatever.social",
+    "https://piped.garudalinux.org",
     "https://y.rivo.lol",
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
@@ -37,6 +38,7 @@
     "https://libreddit.eu.org",
     "https://libreddit.cachyos.org",
     "https://futureddit.gq",
+    "https://libreddit.freedit.eu",
     "https://teddit.domain.glass",
     "https://teddit.httpjames.space",
     "https://teddit.encrypted-data.xyz",
@@ -66,21 +68,22 @@
   ],
   "offline": [
     "https://invidious.rhyshl.live",
-    "https://invidious.esmailelbob.xyz",
     "https://proxitok.odyssey346.dev",
     "https://nhanh.cloud",
-    "https://nitter.winscloud.net",
     "https://ntr.odyssey346.dev",
+    "https://futureddit.gq",
     "https://teddit.ggc-project.de",
+    "https://teddit.froth.zone",
     "https://teddit.tokhmi.xyz",
+    "https://wiki.privacytools.io",
     "https://quetre.odyssey346.dev",
-    "https://simplytranslate.org",
-    "https://translate.northboot.xyz",
     "https://st.odyssey346.dev",
+    "https://translate.projectsegfau.lt",
     "https://jsearch.pw",
     "https://searx.gnu.style",
     "https://searx.semipvt.com",
     "https://etsi.me",
+    "https://search.chemicals-in-the-water.eu",
     "https://search.zzls.xyz",
     "https://searx.ericaftereric.top",
     "https://searx.fmac.xyz",
@@ -89,7 +92,6 @@
     "https://whoogle.esmailelbob.xyz",
     "https://search.wef.lol",
     "https://i.bcow.xyz",
-    "https://i.actionsack.com",
     "https://lbry.bcow.xyz",
     "https://beatbump.ml",
     "https://bw.odyssey346.dev"
diff --git a/src/instances/data.json b/src/instances/data.json
index cbff9aac..a5a7177e 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -18,9 +18,9 @@
       "https://invidious.projectsegfau.lt",
       "https://invidious.rhyshl.live",
       "https://inv.privacy.com.de",
+      "https://invidious.slipfox.xyz",
       "https://invidious.esmailelbob.xyz",
       "https://youtube.076.ne.jp",
-      "https://invidious.slipfox.xyz",
       "https://invidious.namazso.eu"
     ],
     "tor": [
@@ -36,24 +36,28 @@
       "http://ng27owmagn5amdm7l5s3rsqxwscl5ynppnis5dqcasogkyxcfqn7psid.onion",
       "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion"
     ],
-    "i2p": [],
+    "i2p": [
+      "http://verni6dr4qxjgjumnvesxerh5rvhv6oy5ddeibaqy5d7tgbiiyfa.b32.i2p"
+    ],
     "loki": []
   },
   "piped": {
     "clearnet": [
       "https://piped.kavin.rocks",
+      "https://piped.tokhmi.xyz",
       "https://piped.moomoo.me",
       "https://piped.mha.fi",
       "https://de-piped.shimul.me",
       "https://pipedus.palash.dev",
       "https://watch.whatever.social",
+      "https://piped.garudalinux.org",
       "https://y.rivo.lol",
       "https://yt.jae.fi",
       "https://piped.mint.lgbt",
       "https://il.ax",
+      "https://piped.esmailelbob.xyz",
       "https://piped.projectsegfau.lt",
       "https://piped.privacydev.net",
-      "https://piped.palveluntarjoaja.eu",
       "https://piped.smnz.de",
       "https://piped.adminforge.de",
       "https://watch.whatevertinfoil.de",
@@ -234,7 +238,10 @@
       "http://qwikxx2erhx6qrymued6ox2qkf2yeogjwypqvzoif4fqkljixasr6oid.onion",
       "http://4g47cxugkohbweao2x66nnxxfoe3k7gdfzxej537nhdbwr522sbjxeqd.onion",
       "http://nt.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
-      "http://tw.lpoaj7z2zkajuhgnlltpeqh3zyq7wk2iyeggqaduhgxhyajtdt2j7wad.onion"
+      "http://tw.lpoaj7z2zkajuhgnlltpeqh3zyq7wk2iyeggqaduhgxhyajtdt2j7wad.onion",
+      "http://r2eqimhkvxboaltbdsectoo3hkf476pyemsdykclexzajbfx5v6ojlyd.onion",
+      "http://li7snkj6oituazbkr5clmilccwwumhd2dntbhttxomy4dfakeeoar4qd.onion",
+      "http://a5xyidyppowvblric6k6nixgf2eqwnb7zzeaarj7slqbv7tb6ip5t3ad.onion"
     ],
     "i2p": [
       "http://axd6uavsstsrvstva4mzlzh4ct76rc6zdug3nxdgeitrzczhzf4q.b32.i2p",
@@ -302,7 +309,8 @@
       "https://futureddit.gq",
       "https://lr.slipfox.xyz",
       "https://libreddit.oxymagnesium.com",
-      "https://reddit.utsav2.dev"
+      "https://reddit.utsav2.dev",
+      "https://libreddit.freedit.eu"
     ],
     "tor": [
       "http://ecue64ybzvn6vjzl37kcsnwt4ycmbsyf74nbttyg7rkc3t3qwnj7mcyd.onion",
@@ -522,7 +530,6 @@
   "searx": {
     "clearnet": [
       "https://dynabyte.ca",
-      "https://icanfindit.online",
       "https://jsearch.pw",
       "https://search.ethibox.fr",
       "https://search.snopyta.org",
@@ -538,6 +545,7 @@
       "https://searx.nakhan.net",
       "https://searx.netzspielplatz.de",
       "https://searx.nixnet.services",
+      "https://searx.rimkus.it",
       "https://searx.ru",
       "https://searx.run",
       "https://searx.semipvt.com",
@@ -560,12 +568,12 @@
     ],
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
+      "http://privateoz3u5utrimal2edr56j3r5caakektxxgixigdkycuxigvquid.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
       "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
-      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
-      "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion"
+      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -633,7 +641,6 @@
       "https://searx.orion-hub.fr",
       "https://searx.priv.pw",
       "https://searx.prvcy.eu",
-      "https://searx.rimkus.it",
       "https://searx.sethforprivacy.com",
       "https://searx.sev.monster",
       "https://searx.slipfox.xyz/searx",
@@ -656,7 +663,6 @@
     "tor": [
       "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
-      "http://privateoz3u5utrimal2edr56j3r5caakektxxgixigdkycuxigvquid.onion",
       "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
       "http://searxngg6zleq6ceboe5ltkyo4hyrb3aaycrgzmrljv3jjlb5vcytead.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
@@ -664,6 +670,7 @@
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://searx.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion",
       "http://searxfilowxokbogygrigir4wqxfxqzuxofxgdon7dg6rsii4yxzytyd.onion",
+      "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
       "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
       "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
@@ -823,10 +830,10 @@
   },
   "peertube": [
     "https://search.joinpeertube.org",
+    "https://video.bmu.cloud",
     "https://freedomadultgames.video",
     "https://tbh.co-shaoghal.net",
     "https://tube.kansanvalta.org",
-    "https://duanrra.cf",
     "https://ytube.retronerd.at",
     "https://tube.media-techport.de",
     "https://notobono.de",
@@ -844,7 +851,6 @@
     "https://videos.im.allmendenetz.de",
     "https://tube.cyberia.club",
     "https://casstream.nohost.me",
-    "https://peertube.as62430.net",
     "https://peertube.askan.info",
     "https://apertatube.net",
     "https://beetoons.tv",
@@ -860,7 +866,6 @@
     "https://tube-test.apps.education.fr",
     "https://tube-sciences-technologies.apps.education.fr",
     "https://tube-institutionnel.apps.education.fr",
-    "https://trutube.online",
     "https://tube-cycle-3.apps.education.fr",
     "https://video.manicphase.me",
     "https://tubulus.openlatin.org",
@@ -893,7 +898,6 @@
     "https://jahve.pl",
     "https://videos.yesil.club",
     "https://peertube.adjutor.xyz",
-    "https://peertube.terranout.mine.nu",
     "https://tube.hunterjozwiak.com",
     "https://tube-numerique-educatif.apps.education.fr",
     "https://tube.itsg.host",
@@ -928,7 +932,6 @@
     "https://seka.pona.la",
     "https://syop.tv",
     "https://watch.thelema.social",
-    "https://tube.miegl.cz",
     "https://mov.clov.fr",
     "https://video.vaku.org.ua",
     "https://videos.trom.lt",
@@ -991,7 +994,6 @@
     "https://ocfedtest.hosted.spacebear.ee",
     "https://video.lono.space",
     "https://mirrored.rocks",
-    "https://videopen.net",
     "https://demo.lioncast.org",
     "https://peertube.get-racing.de",
     "https://pierre.tube",
@@ -1011,14 +1013,12 @@
     "https://ptube.horsentiers.fr",
     "https://video.cnt.social",
     "https://tube.03281.fspfc.org",
-    "https://tube.linc.systems",
     "https://peertube.ketchup.noho.st",
     "https://yt.x1337x.fr",
     "https://videos.rabbit-company.com",
     "https://video.paradigmthreat.net",
     "https://vid.twhtv.club",
     "https://video.retroedge.tech",
-    "https://truvitv.com",
     "https://pt.ilyamikcoder.com",
     "https://peertube.sensin.eu",
     "https://video.sadmin.io",
@@ -1084,7 +1084,6 @@
     "https://peertube.revelin.fr",
     "https://peertube.ti-fr.com",
     "https://video.turbo.chat",
-    "https://peertube.am-networks.fr",
     "https://video.chbmeyer.de",
     "https://video.rs-einrich.de",
     "https://p2ptv.ru",
@@ -1143,7 +1142,6 @@
     "https://tube.childrenshealthdefense.eu",
     "https://stream.litera.tools",
     "https://peertube.kriom.net",
-    "https://peertube.grosist.fr",
     "https://peertube.gemlog.ca",
     "https://nettube.uc-netcorsoft.de",
     "https://live.solari.com",
@@ -1196,7 +1194,6 @@
     "https://video.windfluechter.org",
     "https://pocketnetpeertube10.nohost.me",
     "https://tube.io18.top",
-    "https://peertube.remerge.net",
     "https://tube.geekyboo.net",
     "https://notretube.asselma.eu",
     "https://canal.facil.services",
@@ -1482,7 +1479,6 @@
     "https://video.mycrowd.ca",
     "https://kodcast.com",
     "https://video.altertek.org",
-    "https://ruraletv.ovh",
     "https://tube.oisux.org",
     "https://peertube.louisematic.site",
     "https://clap.nerv-project.eu",
@@ -1667,7 +1663,6 @@
     "https://video.vny.fr",
     "https://peervideo.club",
     "https://tube.taker.fr",
-    "https://peertube.co.uk",
     "https://video.fitchfamily.org",
     "https://video.fdlibre.eu",
     "https://peer.philoxweb.be",
diff --git a/src/pages/popup/style.css b/src/pages/popup/style.css
index 3b409be8..53589738 100644
--- a/src/pages/popup/style.css
+++ b/src/pages/popup/style.css
@@ -59,6 +59,6 @@ input {
 	content: "";
 	display: block;
 	pointer-events: none;
-	top: 13px;
-	left: 157.4px;
+	top: 14px;
+	left: 156px;
 }
-- 
cgit 1.4.1