diff options
Diffstat (limited to 'src/instances')
| -rw-r--r-- | src/instances/beatbump.json | 5 | ||||
| -rw-r--r-- | src/instances/blacklist.json | 27 | ||||
| -rw-r--r-- | src/instances/data.json | 26 | ||||
| -rw-r--r-- | src/instances/get_instances.py | 19 |
4 files changed, 60 insertions, 17 deletions
diff --git a/src/instances/beatbump.json b/src/instances/beatbump.json index 4c7f65a6..df5a20f7 100644 --- a/src/instances/beatbump.json +++ b/src/instances/beatbump.json @@ -1,5 +1,8 @@ { - "normal": ["https://beatbump.ml"], + "normal": [ + "https://beatbump.ml", + "https://beatbump.esmailelbob.xyz" + ], "tor": [], "i2p": [], "loki": [] diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json index ec77035a..642a6639 100644 --- a/src/instances/blacklist.json +++ b/src/instances/blacklist.json @@ -1,11 +1,11 @@ { "cloudflare": [ "https://invidious.kavin.rocks", - "https://piped.kavin.rocks", "https://piped.tokhmi.xyz", "https://piped.moomoo.me", + "https://piped.syncpundit.com", "https://piped.mha.fi", - "https://us-piped.shimul.me", + "https://jp-piped.shimul.me", "https://pipedus.palash.dev", "https://piped.waffle.wiki", "https://watch.whatever.social", @@ -54,5 +54,28 @@ ], "authenticate": [ "https://nitter:nitter@nitter.nixnet.services" + ], + "offline": [ + "https://invidious.snopyta.org", + "https://tok.habedieeh.re", + "https://n.hyperborea.cloud", + "https://bibliogram.snopyta.org", + "https://insta.trom.tf", + "https://libreddit.autarkic.org", + "https://libreddit.notyourcomputer.net", + "https://anon.sx", + "https://jsearch.pw", + "https://searx.gnu.style", + "https://searx.semipvt.com", + "https://etsi.me", + "https://s.zhaocloud.net", + "https://search.vidhukant.xyz", + "https://searx.ericaftereric.top", + "https://searx.fmac.xyz", + "https://searxng.au/searx", + "https://search.albony.xyz", + "https://whoogle.esmailelbob.xyz", + "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 822d8c92..0565348b 100644 --- a/src/instances/data.json +++ b/src/instances/data.json @@ -7,7 +7,6 @@ "https://inv.riverside.rocks", "https://invidious.osi.kr", "https://y.com.sb", - "https://yt.artemislena.eu", "https://invidious.flokinet.to", "https://invidious.sethforprivacy.com", "https://invidious.tiekoetter.com", @@ -21,6 +20,7 @@ "https://invidious.weblibre.org", "https://invidious.snopyta.org", "https://invidious.esmailelbob.xyz", + "https://yt.artemislena.eu", "https://invidious.namazso.eu" ], "tor": [ @@ -39,16 +39,17 @@ }, "piped": { "normal": [ - "https://piped.kavin.rocks", "https://piped.tokhmi.xyz", "https://piped.moomoo.me", "https://il.ax", + "https://piped.syncpundit.com", "https://piped.mha.fi", - "https://us-piped.shimul.me", + "https://jp-piped.shimul.me", "https://pipedus.palash.dev", "https://piped.waffle.wiki", "https://watch.whatever.social", "https://yt.jae.fi", + "https://piped.mint.lgbt", "https://piped.esmailelbob.xyz", "https://piped.projectsegfau.lt" ], @@ -476,6 +477,8 @@ "https://anon.sx", "https://dynabyte.ca", "https://jsearch.pw", + "https://northboot.xyz", + "https://search.affusio.com", "https://search.ethibox.fr", "https://search.snopyta.org", "https://search.stinpriza.org", @@ -514,6 +517,8 @@ ], "tor": [ "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion", + "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion", + "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion", "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion", "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion", "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion", @@ -531,7 +536,6 @@ "https://de.xcxc.ml", "https://etsi.me", "https://jackgoss.xyz", - "https://northboot.xyz", "https://opnxng.com", "https://paulgo.io", "https://priv.au", @@ -540,7 +544,6 @@ "https://s.zhaocloud.net", "https://saber.tk", "https://search.0relay.com", - "https://search.affusio.com", "https://search.ashs.club", "https://search.bingowaves.xyz", "https://search.bus-hit.me", @@ -586,6 +589,7 @@ "https://searxng.zackptg5.com", "https://serx.ml", "https://sh0.it", + "https://soek.allesbeste.com", "https://srx.cosmohub.io", "https://swag.pw", "https://www.gruble.de", @@ -595,10 +599,8 @@ ], "tor": [ "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion", - "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion", "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion", "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion", - "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion", "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion", "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion", "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion", @@ -698,7 +700,8 @@ }, "beatbump": { "normal": [ - "https://beatbump.ml" + "https://beatbump.ml", + "https://beatbump.esmailelbob.xyz" ], "tor": [], "i2p": [], @@ -732,6 +735,8 @@ "loki": [] }, "peertube": [ + "https://kinotu.be", + "https://tube.nogafa.org", "https://www.neptube.io", "https://tube.ghk-academy.info", "https://pcbu.nl", @@ -818,7 +823,6 @@ "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", @@ -886,7 +890,6 @@ "https://video.niboe.info", "https://peertuibe.fedsinfo.nohost.me", "https://s9.gegenstimme.tv", - "https://pocketnetpeertube1.nohost.me", "https://videos.alamaisondulibre.org", "https://videos.tormentasolar.win", "https://tube.nestor.coop", @@ -947,7 +950,6 @@ "https://pt.nospy.net", "https://yhwh.tube", "https://peerlook.ru", - "https://monero.wf", "https://tube.kicou.info", "https://video.aqr.af", "https://videos-passages.huma-num.fr", @@ -1049,7 +1051,6 @@ "https://ua.peertube.red", "https://peertube.zwindler.fr", "https://videos.fsci.in", - "https://swebbtube.se", "https://video.dnfi.no", "https://peertube.revelin.fr", "https://armstube.com", @@ -1081,7 +1082,6 @@ "https://peertube.home.x0r.fr", "https://peertube.marud.fr", "https://freetubehub.live", - "https://peertube.librelabucm.org", "https://mtube.mooo.com", "https://skeptube.fr", "https://tube.villejuif.fr", diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py index 0d0e8c78..eab4a924 100644 --- a/src/instances/get_instances.py +++ b/src/instances/get_instances.py @@ -89,6 +89,19 @@ def is_authenticate(url): return False return False +def is_offline(url): + try: + r = requests.get(url, timeout=5) + if r.status_code >= 400: + print(url + ' is ' + Fore.RED + 'offline' + Style.RESET_ALL) + print("Status code") + print(r.status_code) + return True + else: + return False + except: + return False + def invidious(): r = requests.get('https://api.invidious.io/instances.json') @@ -635,6 +648,7 @@ mightyList = filterLastSlash(mightyList) cloudflare = [] authenticate = [] +offline = [] for k1, v1 in mightyList.items(): if type(mightyList[k1]) is dict: for k2, v2 in mightyList[k1].items(): @@ -647,12 +661,15 @@ for k1, v1 in mightyList.items(): cloudflare.append(instance) if not instance.endswith('.onion') and not instance.endswith('.i2p') and not instance.endswith('.loki') and is_authenticate(instance): authenticate.append(instance) + if not instance.endswith('.onion') and not instance.endswith('.i2p') and not instance.endswith('.loki') and is_offline(instance): + offline.append(instance) peertube() blacklist = { 'cloudflare': cloudflare, - 'authenticate': authenticate + 'authenticate': authenticate, + 'offline': offline } # Writing to file |