From ca2483146e301a0f2ae13ba686b95b4573991e3e Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Sun, 19 Feb 2023 16:33:41 +0300 Subject: [PATCH] Added Tent, WolfreeAlpha --- blacklist.json | 20 ++++---- data.json | 121 ++++++++++++++++++++++++++---------------------- fixed/tent.json | 9 ++++ instances.py | 45 ++++++++++++++++-- 4 files changed, 128 insertions(+), 67 deletions(-) create mode 100644 fixed/tent.json diff --git a/blacklist.json b/blacklist.json index 99c3b91..956a8b1 100644 --- a/blacklist.json +++ b/blacklist.json @@ -1,12 +1,16 @@ { "cloudflare": [ + "https://invidious.kavin.rocks", "https://invidious.epicsite.xyz", "https://yt.oelrichsgarcia.de", - "https://invidious.kavin.rocks", + "https://invidious.lunar.icu", "https://piped.video", "https://piped.tokhmi.xyz", + "https://piped.moomoo.me", + "https://piped.syncpundit.io", "https://piped.mha.fi", "https://piped.garudalinux.org", + "https://efy.piped.pages.dev", "https://piped.lunar.icu", "https://piped.video", "https://proxitok.marcopisco.com", @@ -61,21 +65,19 @@ "https://whoogle.hxvy0.gq", "https://whoogle.lunar.icu", "https://whoogle.rhyshl.live", - "https://search.milivojevic.in.rs", "https://rimgo.privacytools.io", "https://rimgo.marcopisco.com", "https://rimgo.lunar.icu", "https://imgur.010032.xyz", "https://beatbump.ml", - "https://sendpass.ru", - "https://0.0g.gg", - "https://bin.klowdee.host", - "https://privatebin.io", "https://0a0bin.klowdee.host", - "https://bonus01.hwb0307.com", - "https://paste.oelrichsgarcia.de", - "https://andoc.yateam.cc", "https://luckvintage.com", + "https://bin.klowdee.host", + "https://0.0g.gg", + "https://bonus01.hwb0307.com", + "https://sendpass.ru", + "https://andoc.yateam.cc", + "https://privatebin.io", "https://0.klowdee.host", "https://dumb.lunar.icu", "https://overflow.lunar.icu", diff --git a/data.json b/data.json index 81506dd..1e97a2e 100644 --- a/data.json +++ b/data.json @@ -4,6 +4,7 @@ "https://yewtu.be", "https://vid.puffyan.us", "https://inv.riverside.rocks", + "https://invidious.kavin.rocks", "https://watch.thekitty.zone", "https://y.com.sb", "https://invidious.nerdvpn.de", @@ -12,30 +13,30 @@ "https://invidious.flokinet.to", "https://inv.bp.projectsegfau.lt", "https://inv.odyssey346.dev", - "https://invidious.baczek.me", "https://invidious.sethforprivacy.com", + "https://invidious.baczek.me", "https://invidious.snopyta.org", "https://yt.funami.tech", "https://inv.vern.cc", "https://invidious.epicsite.xyz", "https://iv.ggtyler.dev", - "https://invidious.silur.me", - "https://invidious.esmailelbob.xyz", - "https://invidious.weblibre.org", - "https://iv.melmac.space", "https://yt.oelrichsgarcia.de", - "https://invidious.lidarshield.cloud", + "https://invidious.silur.me", + "https://invidious.lunar.icu", + "https://invidious.weblibre.org", "https://invidious.privacydev.net", + "https://invidious.esmailelbob.xyz", + "https://iv.melmac.space", + "https://invidious.lidarshield.cloud", "https://invidious.slipfox.xyz", - "https://invidious.namazso.eu", - "https://invidious.kavin.rocks" + "https://invidious.namazso.eu" ], "tor": [ "http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion", "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion", "http://grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad.onion", + "http://osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion", "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion", - "http://u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad.onion", "http://euxxcnhsynwmfidvhjf6uzptsmh4dipkmgdmcmxxuo7tunp3ad2jrwyd.onion", "http://invidious.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion", "http://inv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion", @@ -43,7 +44,7 @@ "http://ng27owmagn5amdm7l5s3rsqxwscl5ynppnis5dqcasogkyxcfqn7psid.onion", "http://iv.odysfvr23q5wgt7i456o5t3trw2cw5dgn56vbjfbq2m7xsc5vqbqpcyd.onion", "http://invidious.g4c3eya4clenolymqbpgwz3q3tawoxw56yhzk4vugqrl6dtu3ejvhjid.onion", - "http://osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion" + "http://u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad.onion" ], "i2p": [ "http://verni6dr4qxjgjumnvesxerh5rvhv6oy5ddeibaqy5d7tgbiiyfa.b32.i2p" @@ -54,9 +55,12 @@ "clearnet": [ "https://piped.video", "https://piped.tokhmi.xyz", + "https://piped.moomoo.me", + "https://piped.syncpundit.io", "https://piped.mha.fi", "https://watch.whatever.social", "https://piped.garudalinux.org", + "https://efy.piped.pages.dev", "https://piped.lunar.icu", "https://piped.video", "https://yt.jae.fi", @@ -209,7 +213,6 @@ "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", @@ -221,14 +224,12 @@ "https://nitter.d420.de", "https://nitter.caioalonso.com", "https://nitter.at", - "https://nitter.drivet.xyz", "https://nitter.pw", "https://nitter.nicfab.eu", "https://bird.habedieeh.re", "https://nitter.hostux.net", "https://nitter.adminforge.de", "https://nitter.platypush.tech", - "https://nitter.mask.sh", "https://nitter.pufe.org", "https://nitter.us.projectsegfau.lt", "https://nitter.arcticfoxes.net", @@ -243,8 +244,7 @@ "https://ntr.frail.duckdns.org", "https://nitter.us.projectsegfau.lt", "https://nitter.librenode.org", - "https://n.opnxng.com", - "https://nitter.plus.st" + "https://n.opnxng.com" ], "tor": [ "http://nitter7bryz3jv7e3uekphigvmoyoem4al3fynerxkj22dmoxoq553qd.onion", @@ -548,13 +548,13 @@ "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.priv.pw", "https://searx.roflcopter.fr", "https://searx.ru", "https://searx.semipvt.com", @@ -569,13 +569,12 @@ ], "tor": [ "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion", + "http://searchvrzxoqa4k76duqh4wtzpr553hfl53qpytclxf7zci53lwklfyd.onion", "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion", "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion", "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion", "http://searxfilowxokbogygrigir4wqxfxqzuxofxgdon7dg6rsii4yxzytyd.onion", - "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion", - "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion", - "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion" + "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion" ], "i2p": [ "http://ransack.i2p", @@ -639,7 +638,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", @@ -675,11 +673,11 @@ "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion", "http://privateoz3u5utrimal2edr56j3r5caakektxxgixigdkycuxigvquid.onion", "http://searxyqdegtqksicnwpxa24ipnb2ylmp6iutnnwtazbhup4dit4eeyqd.onion", - "http://searchvrzxoqa4k76duqh4wtzpr553hfl53qpytclxf7zci53lwklfyd.onion", "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion", "http://qyyb5xsar7gp4q3agxnrxgajx4nnnihptqhmyee5nolidtkhxjks6ayd.onion", "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion", "http://searx.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion", + "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion", "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx", "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion", "https://lgmekfnpealdqhnctyg3p5fuelpdwnbqbwnl2ickpdoodzatzgz27ryd.onion" @@ -862,45 +860,46 @@ "privateBin": { "clearnet": [ "https://secrets.true.nl", - "https://sendpass.ru", - "https://snip.dssr.ch", - "https://0.0g.gg", - "https://bin.nixnet.services", - "https://pb.vern.cc", "https://pastebin.linqhost.nl", - "https://paste.aryu.de", - "https://p.darklab.sh", - "https://bin.0xfc.de", - "https://paste.janko.cloud", - "https://bin.klowdee.host", - "https://paste.ottertelecom.com", - "https://privatebin.io", - "https://privatebin.at", - "https://privatebin.wsmm.de", - "https://pastebin.grey.pw", - "https://0a0bin.klowdee.host", - "https://bonus01.hwb0307.com", - "https://paste.tildeverse.org", - "https://bin.foss.wtf", - "https://bin.urla.no", - "https://bin.bus-hit.me", - "https://paste.0xfc.de", - "https://paste.techbag.app", - "https://paste.tuxcloud.net", - "https://paste.07f.de", - "https://paste.oelrichsgarcia.de", - "https://pastebin.hot-chilli.net", - "https://privatebin.net", - "https://privatebin.rockhost.se", - "https://0.jaegers.net", - "https://andoc.yateam.cc", - "https://secrets.cebador.fr", "https://notebin.de", - "https://zerobin.thican.net", + "https://0a0bin.klowdee.host", "https://cpaste.org", "https://luckvintage.com", + "https://privatebin.at", + "https://bin.klowdee.host", + "https://privatebin.rockhost.se", + "https://paste.07f.de", + "https://bin.0xfc.de", + "https://bin.urla.no", + "https://pastebin.hot-chilli.net", + "https://privatebin.wsmm.de", + "https://p.darklab.sh", + "https://bin.foss.wtf", + "https://0.0g.gg", + "https://privatebin.net", + "https://paste.janko.cloud", + "https://pb.vern.cc", + "https://paste.tildeverse.org", + "https://paste.0xfc.de", + "https://bonus01.hwb0307.com", + "https://vip.ci", + "https://paste.momobako.com", + "https://snip.dssr.ch", + "https://bin.bus-hit.me", + "https://pastebin.grey.pw", + "https://paste.tuxcloud.net", + "https://sendpass.ru", + "https://zerobin.thican.net", + "https://paste.ottertelecom.com", + "https://andoc.yateam.cc", + "https://privatebin.io", + "https://paste.techbag.app", + "https://bin.nixnet.services", + "https://secrets.cebador.fr", "https://0.klowdee.host", - "https://vip.ci" + "https://paste.aryu.de", + "https://paste.ononoki.org", + "https://0.jaegers.net" ], "tor": [], "i2p": [], @@ -1061,5 +1060,17 @@ "tor": [], "i2p": [], "loki": [] + }, + "wolfreeAlpha": { + "clearnet": [ + "https://gqq.gitlab.io", + "https://jqq.gitlab.io", + "https://rqq.gitlab.io", + "https://sqq.gitlab.io", + "https://uqq.gitlab.io" + ], + "tor": [], + "i2p": [], + "loki": [] } } \ No newline at end of file diff --git a/fixed/tent.json b/fixed/tent.json new file mode 100644 index 0000000..3ead370 --- /dev/null +++ b/fixed/tent.json @@ -0,0 +1,9 @@ +{ + "clearnet": [ + "https://tent.sny.sh", + "https://tent.bloatcat.tk" + ], + "tor": [], + "i2p": [], + "loki": [] +} \ No newline at end of file diff --git a/instances.py b/instances.py index 25d6018..44350bf 100755 --- a/instances.py +++ b/instances.py @@ -247,7 +247,6 @@ def invidious(): def piped(): frontend = 'piped' - name = 'Piped' try: _list = {} _list['clearnet'] = [] @@ -270,7 +269,7 @@ def piped(): logging.error(traceback.format_exc()) continue mightyList[frontend] = _list - print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + name) + print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + frontend) except Exception: fetchCache(frontend) logging.error(traceback.format_exc()) @@ -438,7 +437,11 @@ def dumb(): def ruralDictionary(): fetchJsonList('ruralDictionary', - 'https://codeberg.org/zortazert/rural-dictionary/raw/branch/master/instances.json', 'clearnet', False) + 'https://codeberg.org/zortazert/rural-dictionary/raw/branch/master/instances.json', + {'clearnet': 'clearnet', 'tor': 'tor', + 'i2p': 'i2p', 'loki': None}, + False + ) def anonymousOverflow(): @@ -506,6 +509,39 @@ def mikuInvidious(): fetchFromFile('mikuInvidious') +def tent(): + fetchFromFile('tent') + + +wolfreeAlpha_url_list = [ + "https://gqsq.gitlab.iso", + "https://jqq.gitlab.io", + "https://rqq.gitlab.io", + "https://sqq.gitlab.io", + "https://uqq.gitlab.io" +] +wolfreeAlpha_url_list_i = 0 +def wolfreeAlpha(i): + global wolfreeAlpha_url_list_i + frontend = 'wolfreeAlpha' + try: + r = requests.get(wolfreeAlpha_url_list[i]+"/instances.json") + if r.status_code != 200: + wolfreeAlpha_url_list_i += 1 + wolfreeAlpha(wolfreeAlpha_url_list_i) + else: + rJson = json.loads(r.text) + networks = rJson['wolfree'] + _list = {} + for i in networks.keys(): + _list[i] = networks[i] + mightyList[frontend] = _list + print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + frontend) + except: + wolfreeAlpha_url_list_i += 1 + wolfreeAlpha(wolfreeAlpha_url_list_i) + + def isValid(url): # This code is contributed by avanitrachhadiya2155 try: result = urlparse(url) @@ -551,6 +587,9 @@ suds() poketube() gothub() mikuInvidious() +wolfreeAlpha(wolfreeAlpha_url_list_i) + + mightyList = filterLastSlash(mightyList) mightyList = idnaEncode(mightyList)