From 3f87eb032c5a48ff84445f69633a9a55fcc27bbc Mon Sep 17 00:00:00 2001 From: BobIsMyManager Date: Tue, 2 Aug 2022 22:30:21 +0100 Subject: [PATCH] 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(-) diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json index 77aec73..e7756f8 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 76c9f6d..3e82842 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 07adbce..eab4a92 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)