diff --git a/README.md b/README.md index 74cdc77..1ea4f52 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,8 @@ - AnonymousOverflow: [https://github.com/httpjamesm/AnonymousOverflow#clearnet-instances](https://github.com/httpjamesm/AnonymousOverflow#clearnet-instances) - Wikiless: [https://web.archive.org/web/20220929180821/https://codeberg.org/orenom/wikiless](https://web.archive.org/web/20220929180821/https://codeberg.org/orenom/wikiless) - BiblioReads: [https://github.com/nesaku/BiblioReads/blob/main/instances.json](https://github.com/nesaku/BiblioReads/blob/main/instances.json) +- Suds: [https://git.vern.cc/cobra/Suds/src/branch/main/instances.json](https://git.vern.cc/cobra/Suds/src/branch/main/instances.json) +- PokeTube: [https://codeberg.org/Ashley/poketube/src/branch/main/instances.json](https://codeberg.org/Ashley/poketube/src/branch/main/instances.json) ## How to run: diff --git a/blacklist.json b/blacklist.json index 97c32ea..b81393a 100644 --- a/blacklist.json +++ b/blacklist.json @@ -5,10 +5,10 @@ "https://yt.oelrichsgarcia.de", "https://piped.video", "https://piped.tokhmi.xyz", + "https://piped.syncpundit.io", "https://piped.mha.fi", "https://piped.garudalinux.org", "https://efy.piped.pages.dev", - "https://watch.leptons.xyz", "https://piped.lunar.icu", "https://piped.video", "https://proxitok.marcopisco.com", @@ -27,7 +27,6 @@ "https://n.sneed.network", "https://nitter.twei.space", "https://nitter.d420.de", - "https://nitter.marcopisco.com", "https://nitter.lunar.icu", "https://twitter.moe.ngo", "https://nitter.freedit.eu", @@ -76,6 +75,9 @@ "https://wiki.privacytools.io", "https://wikiless.rawbit.ninja", "https://biblioreads.ga", - "https://biblioreads.lunar.icu" + "https://biblioreads.lunar.icu", + "https://poketube.site", + "https://poketube.online", + "https://poketube.xyz" ] } \ No newline at end of file diff --git a/data.json b/data.json index d9712a5..1d6088b 100644 --- a/data.json +++ b/data.json @@ -10,8 +10,6 @@ "https://invidious.nerdvpn.de", "https://invidious.tiekoetter.com", "https://yt.artemislena.eu", - "https://invidious.flokinet.to", - "https://inv.bp.projectsegfau.lt", "https://inv.odyssey346.dev", "https://invidious.baczek.me", "https://invidious.snopyta.org", @@ -20,17 +18,19 @@ "https://invidious.epicsite.xyz", "https://iv.ggtyler.dev", "https://yt.oelrichsgarcia.de", - "https://vid.priv.au", "https://inv.vern.cc", + "https://vid.priv.au", "https://invidious.slipfox.xyz", - "https://invidious.weblibre.org", - "https://invidious.dhusch.de", "https://invidious.esmailelbob.xyz", + "https://invidious.dhusch.de", + "https://invidious.weblibre.org", "https://iv.melmac.space", "https://invidious.silur.me", "https://invidious.lidarshield.cloud", "https://invidious.drivet.xyz", "https://invidious.privacydev.net", + "https://inv.bp.projectsegfau.lt", + "https://invidious.flokinet.to", "https://invidious.namazso.eu" ], "tor": [ @@ -57,11 +57,11 @@ "clearnet": [ "https://piped.video", "https://piped.tokhmi.xyz", + "https://piped.syncpundit.io", "https://piped.mha.fi", "https://watch.whatever.social", "https://piped.garudalinux.org", "https://efy.piped.pages.dev", - "https://watch.leptons.xyz", "https://piped.lunar.icu", "https://piped.video", "https://yt.jae.fi", @@ -72,7 +72,6 @@ "https://piped.smnz.de", "https://piped.adminforge.de", "https://piped.hostux.net", - "https://pd.vern.cc", "https://piped.chauvet.pro" ], "tor": [], @@ -160,7 +159,6 @@ "https://nitter.domain.glass", "https://nitter.namazso.eu", "https://birdsite.xanny.family", - "https://nitter.hu", "https://nitter.moomoo.me", "https://bird.trom.tf", "https://nitter.it", @@ -175,7 +173,6 @@ "https://nitter.nl", "https://nitter.mint.lgbt", "https://nitter.bus-hit.me", - "https://fuckthesacklers.network", "https://nitter.esmailelbob.xyz", "https://tw.artemislena.eu", "https://nitter.winscloud.net", @@ -187,7 +184,7 @@ "https://nitter.dcs0.hu", "https://twitter.dr460nf1r3.org", "https://nitter.garudalinux.org", - "https://twitter.beparanoid.de", + "https://twitter.femboy.hu", "https://nitter.cz", "https://nitter.privacydev.net", "https://nitter.evil.site", @@ -201,7 +198,6 @@ "https://nitter.projectsegfau.lt", "https://nitter.eu.projectsegfau.lt", "https://singapore.unofficialbird.com", - "https://nitter.fprivacy.com", "https://canada.unofficialbird.com", "https://india.unofficialbird.com", "https://nederland.unofficialbird.com", @@ -235,42 +231,28 @@ "https://nitter.mask.sh", "https://nitter.pufe.org", "https://nitter.us.projectsegfau.lt", - "https://nitter.marcopisco.com", "https://nitter.arcticfoxes.net", "https://t.com.sb", "https://nitter.kling.gg", - "https://twt.funami.tech", "http://nitter.ktachibana.party", "https://nitter.riverside.rocks", - "https://bird.wilbvr.me", "https://nitter.girlboss.ceo", "https://nitter.lunar.icu", "https://twitter.moe.ngo", "https://nitter.freedit.eu", "https://ntr.frail.duckdns.org", "https://nitter.us.projectsegfau.lt", - "https://nitter.librenode.org" + "https://nitter.librenode.org", + "https://n.opnxng.com" ], "tor": [ "http://nitter7bryz3jv7e3uekphigvmoyoem4al3fynerxkj22dmoxoq553qd.onion", - "http://npf37k3mtzwxreiw52ccs5ay4e6qt2fkcs2ndieurdyn2cuzzsfyfvid.onion", "http://26oq3gioiwcmfojub37nz5gzbkdiqp7fue5kvye7d4txv4ny6fb4wwid.onion", "http://vfaomgh4jxphpbdfizkm5gbtjahmei234giqj4facbwhrfjtcldauqad.onion", - "http://iwgu3cv7ywf3gssed5iqtavmrlszgsxazkmwwnt4h2kdait75thdyrqd.onion", - "http://erpnncl5nhyji3c32dcfmztujtl3xaddqb457jsbkulq24zqq7ifdgad.onion", - "http://ckzuw5misyahmg7j5t5xwwuj3bwy62jfolxyux4brfflramzsvvd3syd.onion", - "http://jebqj47jgxleaiosfcxfibx2xdahjettuydlxbg64azd4khsxv6kawid.onion", - "http://nttr2iupbb6fazdpr2rgbooon2tzbbsvvkagkgkwohhodjzj43stxhad.onion", "http://nitraeju2mipeziu2wtcrqsxg7h62v5y4eqgwi75uprynkj74gevvuqd.onion", "http://nitter.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion", "http://ibsboeui2im5o7dxnik3s5yghufumgy5abevtij5nbizequfpu4qi4ad.onion", - "http://ec5nvbycpfa5k6ro77blxgkyrzbkv7uy6r5cngcbkadtjj2733nm3uyd.onion", - "http://twitter.ap3jtgssd7qn4vfoa62gi2ijddoblslbeuw5dan3xt7myvqpura5i4qd.onion", - "http://twitter.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion", - "http://nitter.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion", - "http://fbdi323aj3t6hdx4jtkuwxrnafzskquciowu2yu3jizfssaq35aow6ad.onion", "http://nitterqdyumlovt7tjqpdjrluitgmtpa53qq3idlpgoe4kxo7gs3xvad.onion", - "http://nitter.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion", "http://aaaaaxx74hbzeibageieowryhsqvimbdiitfkfe47tvgawkwkjh3coqd.onion", "http://wiio4sgs4247brk7hj6qck2jxnvldwfdbguigc5ivpxrsegnliyfvuqd.onion", "http://qwikxx2erhx6qrymued6ox2qkf2yeogjwypqvzoif4fqkljixasr6oid.onion", @@ -285,7 +267,8 @@ "http://nitter.g4c3eya4clenolymqbpgwz3q3tawoxw56yhzk4vugqrl6dtu3ejvhjid.onion", "http://jdadsqkjereqronxzovgvd453snh5jsvo7mukfwt2feth353nobqotad.onion", "http://oawb4ub2x2jehgg7k7ll4uoay34re5nbbnwnztpphdec6wkcxgarwbad.onion", - "http://nitter.pjsfkvpxlinjamtawaksbnnaqs2fc2mtvmozrzckxh7f3kis6yea25ad.onion" + "http://nitter.pjsfkvpxlinjamtawaksbnnaqs2fc2mtvmozrzckxh7f3kis6yea25ad.onion", + "http://twitter.cepyxplublbyw2f4axy4pyztfbxmf63lrt2c7uwv6wl4iixz53czload.onion" ], "i2p": [ "http://axd6uavsstsrvstva4mzlzh4ct76rc6zdug3nxdgeitrzczhzf4q.b32.i2p", @@ -560,17 +543,20 @@ "searx": { "clearnet": [ "https://jsearch.pw", - "https://search.affusio.com", + "https://search.privacyguides.net", "https://search.stinpriza.org", "https://search.trom.tf", "https://searx.bissisoft.com", "https://searx.divided-by-zero.eu", "https://searx.dresden.network", + "https://searx.fi", "https://searx.fossencdi.org", "https://searx.gnu.style", + "https://searx.kutay.dev", "https://searx.mastodontech.de", "https://searx.mxchange.org", "https://searx.nixnet.services", + "https://searx.rasp.fr", "https://searx.roflcopter.fr", "https://searx.ru", "https://searx.semipvt.com", @@ -590,8 +576,7 @@ "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion", "http://searxfilowxokbogygrigir4wqxfxqzuxofxgdon7dg6rsii4yxzytyd.onion", "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion", - "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion", - "http://lgmekfnpealdqhnctyg3p5fuelpdwnbqbwnl2ickpdoodzatzgz27ryd.onion" + "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion" ], "i2p": [ "http://ransack.i2p", @@ -621,6 +606,7 @@ "https://s.zhaocloud.net", "https://search.0relay.com", "https://search.0xgingi.com", + "https://search.affusio.com", "https://search.bus-hit.me", "https://search.charleseroop.com", "https://search.chemicals-in-the-water.eu", @@ -635,7 +621,6 @@ "https://search.mpx.wtf", "https://search.neet.works", "https://search.ononoki.org", - "https://search.privacyguides.net", "https://search.rabbit-company.com", "https://search.rhscz.eu", "https://search.rowie.at", @@ -655,7 +640,6 @@ "https://searx.delicta.pp.ua", "https://searx.ericaftereric.top", "https://searx.esmailelbob.xyz", - "https://searx.fi", "https://searx.fmac.xyz", "https://searx.gnous.eu", "https://searx.juancord.xyz", @@ -666,7 +650,6 @@ "https://searx.orion-hub.fr", "https://searx.priv.pw", "https://searx.prvcy.eu", - "https://searx.rasp.fr", "https://searx.sev.monster", "https://searx.si", "https://searx.slipfox.xyz/searx", @@ -680,6 +663,7 @@ "https://searxng.nicfab.eu", "https://spot.murena.io", "https://srx.cosmohub.io", + "https://stalk.antelope.day", "https://swag.pw", "https://sx.fukt.lol", "https://www.gruble.de", @@ -698,7 +682,8 @@ "http://searx.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion", "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion", "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx", - "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion" + "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion", + "https://lgmekfnpealdqhnctyg3p5fuelpdwnbqbwnl2ickpdoodzatzgz27ryd.onion" ], "i2p": [], "loki": [] @@ -897,7 +882,8 @@ "libMedium": { "clearnet": [ "https://libmedium.batsense.net", - "https://md.vern.cc" + "https://md.vern.cc", + "https://medium.hostux.net" ], "tor": [ "http://md.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion" @@ -930,7 +916,8 @@ "https://ao.vern.cc", "https://overflow.smnz.de", "https://anonymousoverflow.esmailelbob.xyz", - "https://overflow.lunar.icu" + "https://overflow.lunar.icu", + "https://overflow.adminforge.de" ], "tor": [ "http://ao.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion", @@ -987,5 +974,30 @@ "http://vernapl3lpo3huqdx3pjzxqgdgavxjlmdskbvejh2gfqgmjuyvxq.b32.i2p" ], "loki": [] + }, + "suds": { + "clearnet": [ + "https://sd.vern.cc", + "https://sd.fukt.lol" + ], + "tor": [ + "http://sd.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion" + ], + "i2p": [ + "http://vernrdigztvu3427stlditjofgkuoc3b7kbkxvlecaej5ufe4l5q.b32.i2p" + ], + "loki": [] + }, + "poketube": { + "clearnet": [ + "https://poketube.fun", + "https://poketube.site", + "https://poketube.online", + "https://poketube.xyz", + "https://pt.zzls.xyz" + ], + "tor": [], + "i2p": [], + "loki": [] } } \ No newline at end of file diff --git a/instances.py b/instances.py index 3a95d85..6576831 100755 --- a/instances.py +++ b/instances.py @@ -153,7 +153,7 @@ def fetchJsonList(frontend, url, urlItem, jsonObject): mightyList[frontend] = _list print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + frontend) except Exception: - fetchCache(frontend, frontend) + fetchCache(frontend) logging.error(traceback.format_exc()) @@ -180,7 +180,7 @@ def fetchRegexList(frontend, url, regex): mightyList[frontend] = _list print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + frontend) except Exception: - fetchCache(frontend, ) + fetchCache(frontend) logging.error(traceback.format_exc()) @@ -215,7 +215,7 @@ def fetchTextList(frontend, url, prepend): mightyList[frontend] = _list print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + frontend) except Exception: - fetchCache(frontend, frontend) + fetchCache(frontend) logging.error(traceback.format_exc()) @@ -241,7 +241,7 @@ def invidious(): mightyList[frontend] = _list print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + name) except Exception: - fetchCache(frontend, name) + fetchCache(frontend) logging.error(traceback.format_exc()) @@ -272,7 +272,7 @@ def piped(): mightyList[frontend] = _list print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + name) except Exception: - fetchCache(frontend, name) + fetchCache(frontend) logging.error(traceback.format_exc()) @@ -459,6 +459,42 @@ def biblioReads(): ) +def suds(): + fetchJsonList( + 'suds', 'https://git.vern.cc/cobra/Suds/raw/branch/main/instances.json', + { + 'clearnet': 'clearnet', + 'tor': 'tor', + 'i2p': 'i2p', + 'loki': None + }, + False, + ) + + +def poketube(): + frontend = 'poketube' + try: + r = requests.get( + 'https://codeberg.org/Ashley/poketube/raw/branch/main/instances.json') + rJson = json.loads(r.text) + _list = { + 'clearnet': [], + 'tor': [], + 'i2p': [], + 'loki': [] + + } + for element in rJson: + _list['clearnet'].append(element[1]['uri']) + + mightyList[frontend] = _list + print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + frontend) + except Exception: + fetchCache(frontend) + logging.error(traceback.format_exc()) + + def isValid(url): # This code is contributed by avanitrachhadiya2155 try: result = urlparse(url) @@ -500,6 +536,8 @@ dumb() anonymousOverflow() wikiless() biblioReads() +suds() +poketube() mightyList = filterLastSlash(mightyList) mightyList = idnaEncode(mightyList)