I2P support for search, Imgur and Wikipedia (#189)

2 files changed, 18 insertions, 11 deletions

diff --git a/src/instances/data.json b/src/instances/data.json
index c189a898..c8c57edb 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -35,7 +35,8 @@
   },
   "proxiTok": {
     "normal": [
-      "https://proxitok.herokuapp.com"
+      "https://proxitok.herokuapp.com",
+      "https://proxitok.pussthecat.org/"
     ],
     "tor": []
   },
@@ -441,7 +442,8 @@
       "https://whoogle.esmailelbob.xyz",
       "https://whoogle.lunar.icu"
     ],
-    "tor": []
+    "tor": [],
+    "i2p": []
   },
   "rimgo": {
     "normal": [
@@ -452,14 +454,16 @@
       "https://rimgo.bus-hit.me",
       "https://rimgo.esmailelbob.xyz",
       "https://rimgo.lunar.icu",
-      "https://i.actionsack.com",
-      "https://xazdnfgtzmcbcxhmcbbvr4uodd6jtn4fdiayasghywdn227xsmoa.b32.i2p"
+      "https://i.actionsack.com"
     ],
     "tor": [
       "http://l4d4owboqr6xcmd6lf64gbegel62kbudu3x3jnldz2mx6mhn3bsv3zyd.onion",
       "http://jx3dpcwedpzu2mh54obk5gvl64i2ln7pt5mrzd75s4jnndkqwzaim7ad.onion",
       "http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
       "http://be7udfhmnzqyt7cxysg6c4pbawarvaofjjywp35nhd5qamewdfxl6sid.onion"
+    ],
+    "i2p": [
+      "http://xazdnfgtzmcbcxhmcbbvr4uodd6jtn4fdiayasghywdn227xsmoa.b32.i2p"
     ]
   },
   "peertube": [
@@ -632,7 +636,6 @@
     "https://peertube.noussommes.org",
     "https://exode.me",
     "https://megatube.lilomoino.fr",
-    "https://zapping.no-ip.info",
     "https://video.anartist.org",
     "https://peertube.home.x0r.fr",
     "https://peertube.marud.fr",
@@ -679,7 +682,6 @@
     "https://video.firehawk-systems.com",
     "https://tube.otter.sh",
     "https://replay.jres.org",
-    "https://videonaute.fr",
     "https://peertube.lagob.fr",
     "https://peertube.gcaillaut.fr",
     "https://peertube.hellsite.net",
@@ -690,7 +692,6 @@
     "https://nattyvideo.com",
     "https://video.zarchbox.ovh",
     "https://video-vision.elemsys.com",
-    "https://videos.ysarris.xyz",
     "https://video.sgiath.dev",
     "https://videos.b4tech.org",
     "https://video.off-investigation.fr",
@@ -851,7 +852,6 @@
     "https://pony.tube",
     "https://peertube.umeahackerspace.se",
     "https://tube.okcinfo.news",
-    "https://stream.conesphere.cloud",
     "https://www.rocaguinarda.tv",
     "https://videos.wirtube.de",
     "https://tube.tinfoil-hat.net",
@@ -1143,7 +1143,6 @@
     "https://tube-creteil.beta.education.fr",
     "https://tube.saumon.io",
     "https://tube-paris.beta.education.fr",
-    "https://videos.judrey.eu",
     "https://theater.ethernia.net",
     "https://watch.tubelab.video",
     "https://lastbreach.tv",
diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py
index 0d4c9a67..d0c325c2 100644
--- a/src/instances/get_instances.py
+++ b/src/instances/get_instances.py
@@ -231,8 +231,14 @@ tmpList = r.text.strip().split('\n')
 whoogleList = {}
 whoogleList['normal'] = []
 whoogleList['tor'] = []
+whoogleList['i2p'] = []
 for item in tmpList:
-    whoogleList['normal'].append(item)
+    if item.endswith('.onion'):
+        whoogleList['tor'].append(item)
+    elif item.endswith('.i2p'):
+        whoogleList['i2p'].append(item)
+    else:
+        whoogleList['normal'].append(item)
 mightyList['whoogle'] = whoogleList
 print(Fore.GREEN + 'fetched ' + Style.RESET_ALL + 'Whoogle')
 
@@ -243,10 +249,12 @@ rJson = json.loads(r.text)
 rimgoList = {}
 rimgoList['normal'] = []
 rimgoList['tor'] = []
-
+rimgoList['i2p'] = []
 for item in rJson:
     if item.endswith('.onion'):
         rimgoList['tor'].append('http://' + item)
+    elif item.endswith('.i2p'):
+        rimgoList['i2p'].append('http://' + item)
     else:
         rimgoList['normal'].append('https://' + item)
 mightyList['rimgo'] = rimgoList