diff --git a/blacklist.json b/blacklist.json index 74b3cfd..c924fa0 100644 --- a/blacklist.json +++ b/blacklist.json @@ -39,14 +39,14 @@ "https://hp.iqbalrifai.eu.org", "https://hyperpipe.darkness.services", "https://www.openstreetmap.org", - "https://pb.blackvoid.club", - "https://bin.oldgate.org", - "https://bonus01.hwb0307.com", - "https://sendpass.ru", - "https://private.rmconsulting.com", - "https://n0t.io", "https://paste.3server.de", + "https://private.rmconsulting.com", + "https://bin.oldgate.org", "https://privatebin.io", + "https://sendpass.ru", + "https://n0t.io", + "https://bonus01.hwb0307.com", + "https://pb.blackvoid.club", "https://wikiless.rawbit.ninja", "https://w.sneed.network", "https://biblioreads.mooo.com", diff --git a/data.json b/data.json index e77055f..6234a02 100644 --- a/data.json +++ b/data.json @@ -7,10 +7,10 @@ "https://invidious.jing.rocks", "https://invidious.perennialte.ch", "https://invidious.reallyaweso.me", + "https://invidious.einfachzocken.eu", "https://yewtu.be", "https://invidious.nerdvpn.de", - "https://invidious.privacyredirect.com", - "https://invidious.einfachzocken.eu" + "https://invidious.privacyredirect.com" ], "tor": [ "http://inv.nadekonw7plitnjuawu6ytjsl7jlglk2t6pyq6eftptmiv3dvqndwvyd.onion", @@ -34,15 +34,13 @@ "clearnet": [ "https://watch.leptons.xyz", "https://piped.lunar.icu", - "http://ww25.yapi.vyper.me/?subid1=20240821-0805-3723-bc18-1ca661c8594c", + "http://ww25.yapi.vyper.me/?subid1=20240821-1800-017c-82e8-217bcbac70ef", "https://piped.r4fo.com", "https://piped.video", "https://piped.projectsegfau.lt", "https://piped.in.projectsegfau.lt", - "https://piped.privacydev.net", "https://piped.smnz.de", "https://piped.adminforge.de", - "https://vern.cc", "https://piped.frontendfriendly.xyz", "https://piped.yt", "https://piped.astartes.nl", @@ -86,21 +84,14 @@ "https://proxitok.pabloferreiro.es", "https://proxitok.pussthecat.org", "https://tok.habedieeh.re", - "https://proxitok.esmailelbob.xyz", "https://proxitok.privacydev.net", "https://tok.artemislena.eu", "https://tok.adminforge.de", - "https://tik.hostux.net", - "https://tt.vern.cc", "https://cringe.whatever.social", "https://proxitok.lunar.icu", "https://proxitok.privacy.com.de", - "https://cringe.whateveritworks.org", "https://cringe.seitan-ayoub.lol", - "https://proxitok.kyun.li", - "https://cringe.datura.network", "https://tt.opnxng.com", - "https://proxitok.tinfoil-hat.net", "https://tiktok.wpme.pl", "https://proxitok.r4fo.com", "https://proxitok.belloworld.it" @@ -561,6 +552,7 @@ "https://xo.wtf" ], "tor": [ + "http://lbmegc3rjnekmdxuisynqdc7y3m2tgyq7gj257ooddaobxqjw36bdayd.onion", "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion", "http://whereissky27lxfdrs7ct7a5ievor3tl67qi77rv5luga7wod5jf2mad.onion", "http://searchpie7fejn4wctzm6fgm6oz5vnziltfzzuec6b4qmkr3wrqaoqqd.onion", @@ -846,47 +838,48 @@ }, "privateBin": { "clearnet": [ - "https://onetimesecret.trans-ix.nl", - "https://secrets.true.nl", - "https://paste.techbag.app", - "https://pb.blackvoid.club", - "https://bin.oldgate.org", - "https://bonus01.hwb0307.com", - "https://secrets.l25.cloud", - "https://p.darklab.sh", - "https://sendpass.ru", - "https://paste.waays.fr", - "https://private.rmconsulting.com", - "https://extrait.facil.services", - "https://p.vinci-concessions.com", - "https://bin.nixnet.services", - "https://ots.kocsar.at", - "https://n0t.io", - "https://bin.bus-hit.me", - "https://notebin.de", - "https://paste.hostux.net", - "https://paste.tildeverse.org", - "https://snip.dssr.ch", - "https://privatebin.arch-linux.cz", - "https://vip.ci", "https://secret.hummel-web.at", - "https://0.jaegers.net", - "https://paste.momobako.com", - "https://privatebin.xi.ht", - "https://paste.encrypt.co.il", - "https://bin.0xfc.de", - "https://zerobin.thican.net", - "https://paste.3server.de", - "https://paste.devsite.pl", - "https://paste.tuxcloud.net", - "https://paste.ononoki.org", "https://bin.ngn.tf", - "https://encryp.ch/note", - "https://paste.hackliberty.org", - "https://privatebin.net", + "https://paste.3server.de", + "https://private.rmconsulting.com", + "https://paste.momobako.com", + "https://notebin.de", + "https://bin.oldgate.org", + "https://paste.tuxcloud.net", + "https://privatebin.io", + "https://0.jaegers.net", + "https://onetimesecret.trans-ix.nl", + "https://zerobin.thican.net", + "https://sendpass.ru", + "https://secrets.l25.cloud", + "https://bin.bus-hit.me", + "https://bin.nixnet.services", + "https://paste.hostux.net", + "https://p.vinci-concessions.com", + "https://bin.0xfc.de", + "https://privatebin.xi.ht", + "https://paste.tildeverse.org", + "https://n0t.io", + "https://paste.techbag.app", + "https://paste.waays.fr", + "https://0.0g.gg", + "https://vip.ci", "https://privatebin.wsmm.de", + "https://paste.ononoki.org", "https://paste.ottertelecom.com", - "https://privatebin.io" + "https://extrait.facil.services", + "https://encryp.ch/note", + "https://secrets.true.nl", + "https://snip.dssr.ch", + "https://p.darklab.sh", + "https://paste.devsite.pl", + "https://privatebin.net", + "https://paste.encrypt.co.il", + "https://bonus01.hwb0307.com", + "https://paste.hackliberty.org", + "https://privatebin.arch-linux.cz", + "https://pb.blackvoid.club", + "https://ots.kocsar.at" ], "tor": [], "i2p": [], @@ -1020,19 +1013,6 @@ ], "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", @@ -1151,5 +1131,23 @@ "tor": [], "i2p": [], "loki": [] + }, + "mozhi": { + "clearnet": [ + "https://mozhi.aryak.me", + "https://translate.bus-hit.me", + "https://nyc1.mz.ggtyler.dev", + "https://translate.projectsegfau.lt", + "https://translate.nerdvpn.de", + "https://mozhi.ducks.party", + "https://mozhi.frontendfriendly.xyz", + "https://mozhi.pussthecat.org", + "https://mo.zorby.top", + "https://mozhi.adminforge.de", + "https://translate.privacyredirect.com" + ], + "tor": [], + "i2p": [], + "loki": [] } } \ No newline at end of file diff --git a/main.py b/main.py index c9859d1..8211ae2 100755 --- a/main.py +++ b/main.py @@ -60,6 +60,8 @@ tent(mightyList) laboratory(mightyList) twineo(mightyList) priviblur(mightyList) +mozhi(mightyList) + mightyList = filterLastSlash(mightyList) mightyList = idnaEncode(mightyList) diff --git a/services/translate.py b/services/translate.py index 0b38490..efcfbba 100644 --- a/services/translate.py +++ b/services/translate.py @@ -18,3 +18,12 @@ def libreTranslate(mightyList): r"\[(?:[^\s\/]+\.)+[a-zA-Z0-9]+\]\((https?:\/{2}(?:[^\s\/]+\.)+[a-zA-Z0-9]+)\/?\)\|", mightyList ) + +def mozhi(mightyList): + fetchJsonList( + 'mozhi', + 'https://codeberg.org/aryak/mozhi/raw/branch/master/instances.json', + 'link', + False, + mightyList + ) \ No newline at end of file diff --git a/services/utils.py b/services/utils.py index 1845d06..4558fa2 100644 --- a/services/utils.py +++ b/services/utils.py @@ -155,7 +155,7 @@ def fetchJsonList(frontend, url, urlItem, jsonObject, mightyList): mightyList[frontend] = _list print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + frontend) except Exception: - fetchCache(frontend) + fetchCache(frontend, mightyList) logging.error(traceback.format_exc())