Added I2P and Lokinet support for simply translate. (#4)

Co-authored-by: BobIsMyManager <bimmgitsignature.nly8m@simplelogin.co>
Reviewed-on: https://codeberg.org/LibRedirect/libredirect/pulls/4
Co-authored-by: BobIsMyManager <bobismymanager@noreply.codeberg.org>
Co-committed-by: BobIsMyManager <bobismymanager@noreply.codeberg.org>

3 files changed, 36 insertions, 7 deletions

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 318226f5..d2811d2c 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -35,9 +35,12 @@
     "https://teddit.httpjames.space",
     "https://teddit.encrypted-data.xyz",
     "https://wiki.604kph.xyz",
+    "https://wikiless.lunar.icu",
+    "https://lingva.lunar.icu",
     "https://searx.josie.lol",
     "https://searx.org",
     "https://searx.run",
+    "https://searx.albony.xyz",
     "https://searx.kujonello.cf",
     "https://search.albony.xyz",
     "https://search.garudalinux.org",
@@ -47,4 +50,4 @@
   "authenticate": [
     "https://nitter.nixnet.services"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/instances/data.json b/src/instances/data.json
index 113b6b7d..1598128b 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -14,6 +14,7 @@
       "https://invidious.sethforprivacy.com",
       "https://inv.bp.projectsegfau.lt",
       "https://invidious.projectsegfau.lt",
+      "https://invidious.lunar.icu",
       "https://invidious.nerdvpn.de",
       "https://inv.vern.cc",
       "https://invidious.slipfox.xyz",
@@ -26,7 +27,6 @@
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
       "http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion",
       "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion",
-      "http://grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad.onion",
       "http://osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion",
       "http://u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad.onion",
       "http://euxxcnhsynwmfidvhjf6uzptsmh4dipkmgdmcmxxuo7tunp3ad2jrwyd.onion/",
@@ -377,6 +377,12 @@
       "http://fyng2tsmzmvxmojzbbwmfnsn2lrcyftf4cw6rk5j2v2huliazud3fjid.onion",
       "http://xxtbwyb5z5bdvy2f6l2yquu5qilgkjeewno4qfknvb3lkg3nmoklitid.onion",
       "http://translate.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion"
+    ],
+    "i2p": [
+      "http://kmnkkp4v4ublygtnyq46oacy3qw75nrxxniriuaersumw7bfsm2a.b32.i2p"
+    ],
+    "loki": [
+      "http://translate.priv.loki"
     ]
   },
   "lingva": {
@@ -397,7 +403,8 @@
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
       "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
-      "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion"
+      "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
+      "http://searx.bsbvtqi5oq2cqzn32zt4cr2f2z2rwots3dq7gmdcnlyqoxko2wx6reqd.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -408,6 +415,8 @@
       "https://dynabyte.ca",
       "https://jsearch.pw",
       "https://nibblehole.com",
+      "https://search.antonkling.se",
+      "https://search.chemicals-in-the-water.eu",
       "https://procurx.pt",
       "https://search.ethibox.fr",
       "https://search.jpope.org",
@@ -427,6 +436,7 @@
       "https://searx.nixnet.services",
       "https://searx.openhoofd.nl",
       "https://searx.org",
+      "https://searx.ppeb.me",
       "https://searx.pwoss.org",
       "https://searx.rasp.fr",
       "https://searx.ru",
@@ -477,7 +487,6 @@
       "https://search.ashs.club",
       "https://search.bingowaves.xyz",
       "https://search.bus-hit.me",
-      "https://search.chemicals-in-the-water.eu",
       "https://search.disroot.org",
       "https://search.mdosch.de",
       "https://search.neet.works",
@@ -489,6 +498,7 @@
       "https://search.unlocked.link",
       "https://search.vojkovic.xyz",
       "https://search.zzls.xyz",
+      "https://searx.albony.xyz",
       "https://searx.be",
       "https://searx.becomesovran.com",
       "https://searx.chocoflan.net",
@@ -607,6 +617,7 @@
     "https://infothema.net",
     "https://tube.nilsu.org",
     "https://peertube.nrsk.no",
+    "https://peertube.today",
     "https://podlibre.video",
     "https://videos.tankernn.eu",
     "https://watch.autonomous-zone.earth",
@@ -630,8 +641,10 @@
     "https://tube.nestor.coop",
     "https://live.oldskool.fi",
     "https://dytube.com",
+    "https://video.toby3d.me",
     "https://tube.thierrytalbert.fr",
     "https://peertube.informaction.info",
+    "https://peertube.thele.me",
     "https://tube.ac-amiens.fr",
     "https://tube.alado.space",
     "https://tube.network.europa.eu",
@@ -853,6 +866,7 @@
     "https://tube.1o1.io",
     "https://peertube.aventer.biz",
     "https://videos.rights.ninja",
+    "https://pertur.be",
     "https://tube.pilgerweg-21.de",
     "https://freediverse.com",
     "https://pocketnetpeertube2.nohost.me",
@@ -1582,4 +1596,4 @@
     "https://peertube2.cpy.re",
     "https://peertube.cpy.re"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py
index 7c270843..098bc38b 100644
--- a/src/instances/get_instances.py
+++ b/src/instances/get_instances.py
@@ -279,6 +279,7 @@ def libremdb():
             _list['tor'].append(item)
         else:
             _list['normal'].append(item)
+
     mightyList['libremdb'] = _list
     print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Libremdb')
 
@@ -295,6 +296,16 @@ def simplytranslate():
     for item in r.text.strip().split('\n'):
         simplyTranslateList['tor'].append('http://' + item)
 
+    r = requests.get('https://simple-web.org/instances/simplytranslate_i2p')
+    simplyTranslateList['i2p'] = []
+    for item in r.text.strip().split('\n'):
+        simplyTranslateList['i2p'].append('http://' + item)
+
+    r = requests.get('https://simple-web.org/instances/simplytranslate_loki')
+    simplyTranslateList['loki'] = []
+    for item in r.text.strip().split('\n'):
+        simplyTranslateList['loki'].append('http://' + item)
+
     mightyList['simplyTranslate'] = simplyTranslateList
     print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'SimplyTranslate')
 
@@ -308,6 +319,7 @@ def linvgatranslate():
     lingvaList['tor'] = []
     for item in rJson:
         lingvaList['normal'].append(item)
+
     mightyList['lingva'] = lingvaList
     print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'LinvgaTranslate')
 
@@ -432,9 +444,9 @@ for k1, v1 in mightyList.items():
                     mightyList[k1][k2].remove(instance)
                     print("removed " + instance)
                 else:
-                    if not instance.endswith('.onion') and not instance.endswith('.i2p') and is_cloudflare(instance):
+                    if not instance.endswith('.onion') and not instance.endswith('.i2p') and not instance.endswith('.loki') and is_cloudflare(instance):
                         cloudflare.append(instance)
-                    if not instance.endswith('.onion') and not instance.endswith('.i2p') and is_authenticate(instance):
+                    if not instance.endswith('.onion') and not instance.endswith('.i2p') and not instance.endswith('.loki') and is_authenticate(instance):
                         authenticate.append(instance)
 
 peertube()