diff options
Diffstat (limited to 'src/instances')
| -rw-r--r-- | src/instances/blacklist.json | 9 | ||||
| -rw-r--r-- | src/instances/data.json | 321 | ||||
| -rw-r--r-- | src/instances/get_instances.py | 148 | ||||
| -rw-r--r-- | src/instances/piped.json | 6 |
4 files changed, 398 insertions, 86 deletions
diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json index 726e4fe3..4377c018 100644 --- a/src/instances/blacklist.json +++ b/src/instances/blacklist.json @@ -8,8 +8,11 @@ "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", @@ -20,6 +23,10 @@ "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", @@ -39,6 +46,8 @@ "https://teddit.domain.glass", "https://teddit.httpjames.space", "https://teddit.encrypted-data.xyz", + "https://teddit.garudalinux.org", + "https://tedd.it", "https://wiki.604kph.xyz", "https://searx.org", "https://searx.run", diff --git a/src/instances/data.json b/src/instances/data.json index 27745298..c754bade 100644 --- a/src/instances/data.json +++ b/src/instances/data.json @@ -10,8 +10,8 @@ "https://y.com.sb", "https://yt.artemislena.eu", "https://invidious.flokinet.to", - "https://invidious.tiekoetter.com", "https://invidious.sethforprivacy.com", + "https://invidious.tiekoetter.com", "https://inv.bp.projectsegfau.lt", "https://invidious.projectsegfau.lt", "https://inv.vern.cc", @@ -29,10 +29,12 @@ "http://grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad.onion", "http://osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion", "http://u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad.onion", - "http://euxxcnhsynwmfidvhjf6uzptsmh4dipkmgdmcmxxuo7tunp3ad2jrwyd.onion/", + "http://euxxcnhsynwmfidvhjf6uzptsmh4dipkmgdmcmxxuo7tunp3ad2jrwyd.onion", "http://invidious.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion", - "http://inv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion/" - ] + "http://inv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion" + ], + "i2p": [], + "loki": [] }, "piped": { "normal": [ @@ -44,8 +46,11 @@ "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", @@ -54,15 +59,31 @@ ], "tor": [ "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion" - ] + ], + "i2p": [], + "loki": [] + }, + "pipedMaterial": { + "normal": [ + "https://piped-material.১.net", + "https://piped-material.ftp.sh", + "https://piped-staging.ftp.sh", + "https://ui.piped.১.net" + ], + "tor": [], + "i2p": [], + "loki": [] }, "proxiTok": { "normal": [ "https://proxitok.herokuapp.com", "https://proxitok.pussthecat.org", - "https://proxitok.privacydev.net" + "https://proxitok.privacydev.net", + "https://tok.habedieeh.re" ], - "tor": [] + "tor": [], + "i2p": [], + "loki": [] }, "send": { "normal": [ @@ -72,7 +93,7 @@ "https://send.ephemeral.land", "https://send.mni.li", "https://send.monks.tools", - "https://send.boblorange.net/", + "https://send.boblorange.net", "https://send.aurorabilisim.com", "https://nhanh.cloud", "https://send.datahoarder.dev", @@ -84,7 +105,9 @@ "https://bytefile.de", "https://transfer.acted.org" ], - "tor": [] + "tor": [], + "i2p": [], + "loki": [] }, "nitter": { "normal": [ @@ -140,7 +163,6 @@ "https://tweet.lambda.dance", "https://nitter.ebnar.xyz", "https://nitter.kylrth.com", - "https://nitter.oishi-ra.men", "https://nitter.foss.wtf", "https://nitter.priv.pw", "https://nt.vern.cc", @@ -151,7 +173,17 @@ "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", + "https://nederland.unofficialbird.com", + "https://uk.unofficialbird.com", + "https://n.l5.ca", + "https://nitter.slipfox.xyz" +======= "https://nitter.fprivacy.com" +>>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7 ], "tor": [ "http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion", @@ -177,8 +209,11 @@ "http://fbdi323aj3t6hdx4jtkuwxrnafzskquciowu2yu3jizfssaq35aow6ad.onion", "http://nitterqdyumlovt7tjqpdjrluitgmtpa53qq3idlpgoe4kxo7gs3xvad.onion", "http://nitter.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion", - "http://aaaaaxx74hbzeibageieowryhsqvimbdiitfkfe47tvgawkwkjh3coqd.onion" - ] + "http://aaaaaxx74hbzeibageieowryhsqvimbdiitfkfe47tvgawkwkjh3coqd.onion", + "http://wiio4sgs4247brk7hj6qck2jxnvldwfdbguigc5ivpxrsegnliyfvuqd.onion" + ], + "i2p": [], + "loki": [] }, "bibliogram": { "normal": [ @@ -196,7 +231,9 @@ "https://ig.funami.tech", "https://bib.actionsack.com" ], - "tor": [] + "tor": [], + "i2p": [], + "loki": [] }, "libreddit": { "normal": [ @@ -279,7 +316,9 @@ "http://inz6tbezfwzexva6dize4cqraj2tjdhygxabmcgysccesvw2pybzhbyd.onion", "http://libreddit.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion", "http://lr.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion" - ] + ], + "i2p": [], + "loki": [] }, "teddit": { "normal": [ @@ -300,10 +339,12 @@ "https://teddit.adminforge.de", "https://teddit.bus-hit.me", "https://teddit.froth.zone", - "https://rdt.trom.tf/", + "https://rdt.trom.tf", "https://teddit.encrypted-data.xyz", "https://i.opnxng.com", - "https://teddit.tokhmi.xyz" + "https://teddit.tokhmi.xyz", + "https://teddit.garudalinux.org", + "https://tedd.it" ], "tor": [ "http://snoo.ioensistjs7wd746zluwixvojbbkxhr37lepdvwtdfeav673o64iflqd.onion", @@ -311,7 +352,9 @@ "http://tedditfyn6idalzso5wam5qd3kdtxoljjhbrbbx34q2xkcisvshuytad.onion", "http://dawtyi5e2cfyfmoht4izmczi42aa2zwh6wi34zwvc6rzf2acpxhrcrad.onion", "http://qtpvyiaqhmwccxwzsqubd23xhmmrt75tdyw35kp43w4hvamsgl3x27ad.onion" - ] + ], + "i2p": [], + "loki": [] }, "wikiless": { "normal": [ @@ -323,8 +366,8 @@ "https://wikiless.northboot.xyz", "https://wikiless.tiekoetter.com", "https://wikiless.esmailelbob.xyz", - "", - "https://wiki.slipfox.xyz" + "https://wiki.slipfox.xyz", + "https://wikiless.funami.tech" ], "tor": [ "http://dj2tbh2nqfxyfmvq33cjmhuw7nb6am7thzd3zsjvizeqf374fixbrxyd.onion", @@ -335,7 +378,8 @@ "i2p": [ "http://hflqp2ejxygpj6cdwo3ogfieqmxw3b56w7dblt7bor2ltwk6kcfa.b32.i2p", "http://x33lx4h6d7h6xs4eiqwhvaxn3ea5gn2ifmu3jobnvuvn4k4aej7a.b32.i2p" - ] + ], + "loki": [] }, "scribe": { "normal": [ @@ -345,7 +389,9 @@ "https://scribe.bus-hit.me", "https://scribe.froth.zone" ], - "tor": [] + "tor": [], + "i2p": [], + "loki": [] }, "quetre": { "normal": [ @@ -357,7 +403,9 @@ "https://quetre.tokhmi.xyz", "https://quetre.projectsegfau.lt" ], - "tor": [] + "tor": [], + "i2p": [], + "loki": [] }, "libremdb": { "normal": [ @@ -366,7 +414,9 @@ "https://libremdbeu.herokuapp.com", "https://lmdb.tokhmi.xyz" ], - "tor": [] + "tor": [], + "i2p": [], + "loki": [] }, "simplyTranslate": { "normal": [ @@ -408,9 +458,13 @@ "https://lingva.lunar.icu", "https://lingva.opnxng.com" ], - "tor": [] + "tor": [], + "i2p": [], + "loki": [] }, "searx": { +<<<<<<< HEAD +======= "tor": [ "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion", "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion", @@ -422,6 +476,7 @@ "http://ransack.i2p", "http://mqamk4cfykdvhw5kjez2gnvse56gmnqxn7vkvvbuor4k4j2lbbnq.b32.i2p" ], +>>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7 "normal": [ "https://anon.sx", "https://dynabyte.ca", @@ -455,6 +510,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", @@ -462,10 +518,16 @@ "https://sx.catgirl.cloud", "https://timdor.noip.me/searx", "https://searx.roflcopter.fr" - ] - }, - "searxng": { + ], "tor": [ +<<<<<<< HEAD + "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion", + "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion", + "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion", + "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion", + "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion", + "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion" +======= "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion", "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion", "http://x5gdjh6t7kb4yubpufhtc3l3df2acev3emxdasd5vyuyoon5rzf5zkyd.onion", @@ -478,8 +540,15 @@ "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion", "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion", "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion" +>>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7 ], - "i2p": [], + "i2p": [ + "http://ransack.i2p", + "http://mqamk4cfykdvhw5kjez2gnvse56gmnqxn7vkvvbuor4k4j2lbbnq.b32.i2p" + ], + "loki": [] + }, + "searxng": { "normal": [ "https://darmarit.org/searx", "https://de.xcxc.ml", @@ -494,6 +563,7 @@ "https://privatus.live", "https://s.frlt.one", "https://s.zhaocloud.net", + "https://search.affusio.com", "https://search.ashs.club", "https://search.bingowaves.xyz", "https://search.bus-hit.me", @@ -510,6 +580,10 @@ "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", @@ -527,15 +601,14 @@ "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", - "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx", "https://searx.tiekoetter.com", "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", @@ -544,7 +617,23 @@ "https://www.gruble.de", "https://www.webrats.xyz", "https://xcxc.ml" - ] + ], + "tor": [ + "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" + ], + "i2p": [], + "loki": [] }, "whoogle": { "normal": [ @@ -563,7 +652,24 @@ "https://search.wef.lol" ], "tor": [], - "i2p": [] + "i2p": [], + "loki": [] + }, + "librex": { + "normal": [ + "https://librex.beparanoid.de", + "https://search.davidovski.xyz", + "https://search.funami.tech", + "https://librex.catalyst.sx" + ], + "tor": [ + "http://librex.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion", + "http://librex.so2mpiyfo4cje7bof5v52y3cvjyo2haxpqfvut4sr6gj2ul4mddx2jid.onion" + ], + "i2p": [ + "http://fboseyskrqpi6yjiifvz4ryuoiswjezkqsfxfkm2vmbuhehbpr7q.b32.i2p" + ], + "loki": [] }, "rimgo": { "normal": [ @@ -583,10 +689,128 @@ "http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion", "http://rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion", "http://rimgo.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion" +<<<<<<< HEAD ], - "i2p": [] + "i2p": [], + "loki": [] + }, + "librarian": { + "normal": [ + "https://lbry.bcow.xyz", + "https://odysee.076.ne.jp", + "https://librarian.pussthecat.org", + "https://lbry.mutahar.rocks", + "https://librarian.esmailelbob.xyz", + "https://lbry.vern.cc" +======= +>>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7 + ], + "tor": [ + "http://librarian.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion", + "http://lbry.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion" + ], + "i2p": [], + "loki": [] }, "peertube": [ +<<<<<<< HEAD + "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", + "https://tube-langues-vivantes.apps.education.fr", + "https://tube-arts-lettres-sciences-humaines.apps.education.fr", + "https://videos.scanlines.xyz", + "https://video.kicik.fr", + "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", + "https://tube-maternelle.apps.education.fr", + "https://peertube.onionstorm.net", + "https://dev.dollarvigilante.tv", + "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://themadlads.live", + "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", + "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://videotube.duckdns.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", +======= +>>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7 "https://hitchtube.fr", "https://video.fox-romka.ru", "https://peertube.ctrl-c.liu.se", @@ -640,7 +864,6 @@ "https://turkum.me", "https://video.colibris-outilslibres.org", "https://invoice.peertube.biz", - "https://vnhup.com", "https://peertube.chantierlibre.org", "https://video.9wd.eu", "https://video.niboe.info", @@ -758,7 +981,10 @@ "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", @@ -778,7 +1004,6 @@ "https://tube.nx12.net", "https://redundant2.peertube.support", "https://peertube.ignifi.me", - "https://docker.videos.lecygnenoir.info", "https://tv.based.quest", "https://peertube.beardedtek.com", "https://creemoseducacioninclusiva.uma.es", @@ -788,7 +1013,6 @@ "https://stream.dynacloud.ynh.fr", "https://video.r3s.nrw", "https://peertube.semweb.pro", - "https://sneedtube.com", "https://poast.tv", "https://testube.distrilab.fr", "https://peertube.rse43.com", @@ -861,7 +1085,6 @@ "https://peertube.aventer.biz", "https://videos.rights.ninja", "https://tube.pilgerweg-21.de", - "https://freediverse.com", "https://pocketnetpeertube2.nohost.me", "https://peertube.bubbletea.dev", "https://peertube.art3mis.de", @@ -937,7 +1160,6 @@ "https://video.liveitlive.show", "https://vid.plantplotting.co.uk", "https://video.telemillevaches.net", - "https://p.nogafa.org", "https://tv.pirati.cz", "https://peertube.therealblue.de", "https://tube.nuxnik.com", @@ -982,7 +1204,6 @@ "https://video.rubdos.be", "https://tube.tuxfriend.fr", "https://anarchy.tube", - "https://nsfw.vger.cloud", "https://tube.elemac.fr", "https://tube.nocturlab.fr", "https://videos.optoutpod.com", @@ -1003,7 +1224,6 @@ "https://peertube.tangentfox.com", "https://puffy.tube", "https://tube.kher.nl", - "https://perceptiontravel.tv", "https://watch.ocaml.org", "https://peertube.kleph.eu", "https://tube.missbanal.net", @@ -1083,7 +1303,6 @@ "https://libra.syntazia.org", "https://peertube.beeldengeluid.nl", "https://tv.lumbung.space", - "https://vid.dascoyote.xyz", "https://peertube.cuatrolibertades.org", "https://videos.hush.is", "https://tube.ebin.club", @@ -1093,7 +1312,6 @@ "https://video.migennes.net", "https://irrsinn.video", "https://pocketnetpeertube4.nohost.me", - "https://video.omniatv.com", "https://comf.tube", "https://pocketnetpeertube6.nohost.me", "https://pocketnetpeertube5.nohost.me", @@ -1151,7 +1369,6 @@ "https://videos.benjaminbrady.ie", "https://video.binarydad.com", "https://tube.pmj.rocks", - "https://gary.vger.cloud", "https://video.guerredeclasse.fr", "https://ptmir4.inter21.net", "https://ptmir3.inter21.net", @@ -1168,7 +1385,6 @@ "https://tube.kotur.org", "https://peertube.euskarabildua.eus", "https://video.veloma.org", - "https://vidcommons.org", "https://regarder.sans.pub", "https://tube.rhythms-of-resistance.org", "https://tube-bordeaux.beta.education.fr", @@ -1444,7 +1660,6 @@ "https://video.oh14.de", "https://mytube.madzel.de", "https://monplaisirtube.ddns.net", - "https://video.okaris.de", "https://video.blender.org", "https://peertube.020.pl", "https://tube.azbyka.ru", @@ -1549,20 +1764,6 @@ "https://peertube.qtg.fr", "https://tube.p2p.legal", "https://troll.tv", - "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", - "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" + "https://videos.iut-orsay.fr" ] } \ No newline at end of file diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py index 098bc38b..b8970ee8 100644 --- a/src/instances/get_instances.py +++ b/src/instances/get_instances.py @@ -14,13 +14,17 @@ mightyList = {} def filterLastSlash(urlList): - tmp = [] - for i in urlList: - if i.endswith('/'): - tmp.append(i[:-1]) - print(Fore.YELLOW + "Fixed " + Style.RESET_ALL + i) - else: - tmp.append(i) + tmp = {} + for x in urlList: + tmp[x] = {} + for y in urlList[x]: + tmp[x][y] = [] + for z in urlList[x][y]: + if z.endswith('/'): + tmp[x][y].append(z[:-1]) + print(Fore.YELLOW + "Fixed " + Style.RESET_ALL + z) + else: + tmp[x][y].append(z) return tmp @@ -83,6 +87,8 @@ def invidious(): invidiousList = {} invidiousList['normal'] = [] invidiousList['tor'] = [] + invidiousList['i2p'] = [] + invidiousList['loki'] = [] for instance in rJson: if instance[1]['type'] == 'https': invidiousList['normal'].append(instance[1]['uri']) @@ -99,6 +105,23 @@ def piped(): print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Piped') +def pipedMaterial(): + r = requests.get( + 'https://raw.githubusercontent.com/mmjee/Piped-Material/master/README.md') + + tmp = re.findall( + r"\| (https?:\/{2}(?:.+\.)+[a-zA-Z0-9]*) +\|", r.text) + pipedMaterialList = {} + pipedMaterialList['normal'] = [] + pipedMaterialList['tor'] = [] + pipedMaterialList['i2p'] = [] + pipedMaterialList['loki'] = [] + for item in tmp: + pipedMaterialList['normal'].append(item) + mightyList['pipedMaterial'] = pipedMaterialList + print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'pipedMaterial') + + def proxitok(): r = requests.get( 'https://raw.githubusercontent.com/wiki/pablouser1/ProxiTok/Public-instances.md') @@ -108,6 +131,8 @@ def proxitok(): proxiTokList = {} proxiTokList['normal'] = [] proxiTokList['tor'] = [] + proxiTokList['i2p'] = [] + proxiTokList['loki'] = [] for item in tmp: proxiTokList['normal'].append(re.sub(r'/$', '', item)) mightyList['proxiTok'] = proxiTokList @@ -122,6 +147,8 @@ def send(): sendList = {} sendList['normal'] = [] sendList['tor'] = [] + sendList['i2p'] = [] + sendList['loki'] = [] for item in tmp: sendList['normal'].append(item) mightyList['send'] = sendList @@ -138,6 +165,8 @@ def nitter(): nitterList = {} nitterList['normal'] = [] nitterList['tor'] = [] + nitterList['i2p'] = [] + nitterList['loki'] = [] for table in tables: tbody = table.find('tbody') trs = tbody.find_all('tr') @@ -156,11 +185,13 @@ def nitter(): def bibliogram(): - r = requests.get('https://bibliogram.pussthecat.org/api/instances') + r = requests.get('https://bibliogram.art/api/instances') rJson = json.loads(r.text) bibliogramList = {} bibliogramList['normal'] = [] bibliogramList['tor'] = [] + bibliogramList['i2p'] = [] + bibliogramList['loki'] = [] for item in rJson['data']: bibliogramList['normal'].append(item['address']) mightyList['bibliogram'] = bibliogramList @@ -173,14 +204,14 @@ def libreddit(): libredditList = {} libredditList['normal'] = [] libredditList['tor'] = [] + libredditList['i2p'] = [] + libredditList['loki'] = [] tmp = re.findall( r"\| \[.*\]\(([-a-zA-Z0-9@:%_\+.~#?&//=]{2,}\.[a-z]{2,}\b(?:\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?)\)*\|*[A-Z]{0,}.*\|.*\|", r.text) - tmp = filterLastSlash(tmp) - for item in tmp: - if item.endswith('.onion'): + if re.search("https?:\/{2}(?:[a-zA-Z0-9]+\.)+onion(?:\/[a-zA-Z0-9]+)*\/?", item): libredditList['tor'].append(item) else: libredditList['normal'].append(item) @@ -195,6 +226,8 @@ def teddit(): tedditList = {} tedditList['normal'] = [] tedditList['tor'] = [] + tedditList['i2p'] = [] + tedditList['loki'] = [] for item in rJson: url = item['url'] if url != '': @@ -215,13 +248,17 @@ def wikiless(): wikilessList['normal'] = [] wikilessList['tor'] = [] wikilessList['i2p'] = [] + wikilessList['loki'] = [] for item in rJson: if 'url' in item: - wikilessList['normal'].append(item['url']) + if item['url'].strip() != "": + wikilessList['normal'].append(item['url']) if 'onion' in item: - wikilessList['tor'].append(item['onion']) + if item['onion'].strip() != "": + wikilessList['tor'].append(item['onion']) if 'i2p' in item: - wikilessList['i2p'].append(item['i2p']) + if item['i2p'].strip() != "": + wikilessList['i2p'].append(item['i2p']) mightyList['wikiless'] = wikilessList print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Wikiless') @@ -233,6 +270,8 @@ def scribe(): scribeList = {} scribeList['normal'] = [] scribeList['tor'] = [] + scribeList['i2p'] = [] + scribeList['loki'] = [] for item in rJson: scribeList['normal'].append(item) mightyList['scribe'] = scribeList @@ -245,14 +284,15 @@ def quetre(): _list = {} _list['normal'] = [] _list['tor'] = [] + _list['i2p'] = [] + _list['loki'] = [] tmp = re.findall( r"\| \[.*\]\(([-a-zA-Z0-9@:%_\+.~#?&//=]{2,}\.[a-z]{2,}\b(?:\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?)\)*\|*[A-Z]{0,}.*\|.*\|", r.text) - tmp = filterLastSlash(tmp) for item in tmp: - if item.endswith('.onion'): + if re.search("https?:\/{2}(?:[a-zA-Z0-9]+\.)+onion(?:\/[a-zA-Z0-9]+)*\/?", item): _list['tor'].append(item) else: _list['normal'].append(item) @@ -266,16 +306,17 @@ def libremdb(): _list = {} _list['normal'] = [] _list['tor'] = [] + _list['i2p'] = [] + _list['loki'] = [] tmp = re.findall( r"\| ([-a-zA-Z0-9@:%_\+.~#?&//=]{2,}\.[a-z]{2,}\b(?:\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?)*\|*[A-Z]{0,}.*\|.*\|", r.text) - tmp = filterLastSlash(tmp) for item in tmp: if item.strip() == "": continue - if item.endswith('.onion'): + if re.search("https?:\/{2}(?:[a-zA-Z0-9]+\.)+onion(?:\/[a-zA-Z0-9]+)*\/?", item): _list['tor'].append(item) else: _list['normal'].append(item) @@ -317,6 +358,8 @@ def linvgatranslate(): lingvaList = {} lingvaList['normal'] = [] lingvaList['tor'] = [] + lingvaList['i2p'] = [] + lingvaList['loki'] = [] for item in rJson: lingvaList['normal'].append(item) @@ -328,20 +371,22 @@ def searx_searxng(): r = requests.get('https://searx.space/data/instances.json') rJson = json.loads(r.text) searxList = {} + searxList['normal'] = [] searxList['tor'] = [] searxList['i2p'] = [] - searxList['normal'] = [] + searxList['loki'] = [] searxngList = {} + searxngList['normal'] = [] searxngList['tor'] = [] searxngList['i2p'] = [] - searxngList['normal'] = [] + searxngList['loki'] = [] for item in rJson['instances']: - if item[:-1].endswith('.onion'): + if re.search("https?:\/{2}(?:[a-zA-Z0-9]+\.)+onion(?:\/[a-zA-Z0-9]+)*\/?", item[:-1]): if (rJson['instances'][item].get('generator') == 'searxng'): searxngList['tor'].append(item[:-1]) else: searxList['tor'].append(item[:-1]) - elif item[:-1].endswith('.i2p'): + elif re.search("https?:\/{2}(?:[a-zA-Z0-9]+\.)+i2p(?:\/[a-zA-Z0-9]+)*\/?", item[:-1]): if (rJson['instances'][item].get('generator') == 'searxng'): searxngList['i2p'].append(item[:-1]) else: @@ -365,10 +410,11 @@ def whoogle(): whoogleList['normal'] = [] whoogleList['tor'] = [] whoogleList['i2p'] = [] + whoogleList['loki'] = [] for item in tmpList: - if item.endswith('.onion'): + if re.search("https?:\/{2}(?:[a-zA-Z0-9]+\.)+onion(?:\/[a-zA-Z0-9]+)*\/?", item): whoogleList['tor'].append(item) - elif item.endswith('.i2p'): + elif re.search("https?:\/{2}(?:[a-zA-Z0-9]+\.)+i2p(?:\/[a-zA-Z0-9]+)*\/?", item): whoogleList['i2p'].append(item) else: whoogleList['normal'].append(item) @@ -376,6 +422,31 @@ def whoogle(): print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Whoogle') +def librex(): + r = requests.get( + 'https://raw.githubusercontent.com/hnhx/librex/main/README.md') + _list = {} + _list['normal'] = [] + _list['tor'] = [] + _list['i2p'] = [] + _list['loki'] = [] + + tmp = re.findall( + r"\| {1,2}\[(?:(?:[a-zA-Z0-9]+\.)+[a-zA-Z]{2,}|✅)\]\((https?:\/{2}(?:[a-zA-Z0-9]+\.)+[a-zA-Z0-9]{2,})", r.text) + + for item in tmp: + if item.strip() == "": + continue + elif re.search("https?:\/{2}(?:[a-zA-Z0-9]+\.)+onion(?:\/[a-zA-Z0-9]+)*\/?", item): + _list['tor'].append(item) + elif re.search("https?:\/{2}(?:[a-zA-Z0-9]+\.)+i2p(?:\/[a-zA-Z0-9]+)*\/?", item): + _list['i2p'].append(item) + else: + _list['normal'].append(item) + mightyList['librex'] = _list + print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Librex') + + def rimgo(): r = requests.get( 'https://codeberg.org/video-prize-ranch/rimgo/raw/branch/main/instances.json') @@ -384,6 +455,7 @@ def rimgo(): rimgoList['normal'] = [] rimgoList['tor'] = [] rimgoList['i2p'] = [] + rimgoList['loki'] = [] for item in rJson: if 'url' in item: rimgoList['normal'].append(item['url']) @@ -395,6 +467,30 @@ def rimgo(): print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Rimgo') +def librarian(): + r = requests.get( + 'https://codeberg.org/librarian/librarian/raw/branch/main/instances.json') + rJson = json.loads(r.text) + librarianList = {} + librarianList['normal'] = [] + librarianList['tor'] = [] + librarianList['i2p'] = [] + librarianList['loki'] = [] + instances = rJson['instances'] + for item in instances: + url = item['url'] + if url.strip() == "": + continue + elif re.search("https?:\/{2}(?:[a-zA-Z0-9]+\.)+onion(?:\/[a-zA-Z0-9]+)*\/?", url): + librarianList['tor'].append(url) + elif re.search("https?:\/{2}(?:[a-zA-Z0-9]+\.)+i2p(?:\/[a-zA-Z0-9]+)*\/?", url): + librarianList['i2p'].append(url) + else: + librarianList['normal'].append(url) + mightyList['librarian'] = librarianList + print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Librarian') + + def peertube(): r = requests.get( 'https://instances.joinpeertube.org/api/v1/instances?start=0&count=1045&sort=-createdAt') @@ -418,6 +514,7 @@ def isValid(url): # This code is contributed by avanitrachhadiya2155 invidious() piped() +pipedMaterial() proxitok() send() nitter() @@ -432,7 +529,10 @@ simplytranslate() linvgatranslate() searx_searxng() whoogle() +librex() rimgo() +librarian() +mightyList = filterLastSlash(mightyList) cloudflare = [] authenticate = [] diff --git a/src/instances/piped.json b/src/instances/piped.json index 00220bb0..5076091d 100644 --- a/src/instances/piped.json +++ b/src/instances/piped.json @@ -18,5 +18,7 @@ ], "tor": [ "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion" - ] -} + ], + "i2p": [], + "loki": [] +} \ No newline at end of file |