From c9d4f941fc401ecf78a87158d4e8380f663218a7 Mon Sep 17 00:00:00 2001
From: Jacob Parnell <jparnell@mailfence.com>
Date: Fri, 28 Jul 2023 23:53:01 -0500
Subject: [PATCH] Add instance fetchers for PixivFE, Binternet, Tent

Also added link to BreezeWiki instance list in README
---
 README.md       |  6 +++++-
 fixed/tent.json |  9 ---------
 instances.py    | 17 +++++++++++++++--
 3 files changed, 20 insertions(+), 12 deletions(-)
 delete mode 100644 fixed/tent.json

diff --git a/README.md b/README.md
index 1ea4f52..fb998e4 100644
--- a/README.md
+++ b/README.md
@@ -10,10 +10,13 @@
 - Libreddit: [https://github.com/libreddit/libreddit-instances/blob/master/instances.json](https://github.com/libreddit/libreddit-instances/blob/master/instances.json)
 - Teddit: [https://codeberg.org/teddit/teddit/src/branch/main/instances.json](https://codeberg.org/teddit/teddit/src/branch/main/instances.json)
 - Rimgo: [https://codeberg.org/video-prize-ranch/rimgo/src/branch/main/instances.json](https://codeberg.org/video-prize-ranch/rimgo/src/branch/main/instances.json)
+- PixivFE: [https://codeberg.org/VnPower/pixivfe#instances](https://codeberg.org/VnPower/pixivfe#instances)
 - Scribe: [https://git.sr.ht/~edwardloveall/scribe/tree/main/item/docs/instances.json](https://git.sr.ht/~edwardloveall/scribe/tree/main/item/docs/instances.json)
 - LibMedium: [https://github.com/realaravinth/libmedium#instances](https://github.com/realaravinth/libmedium#instances)
 - Quetre: [https://github.com/zyachel/quetre#instances](https://github.com/zyachel/quetre#instances)
 - libremdb: [https://github.com/zyachel/libremdb#instances](https://github.com/zyachel/libremdb#instances)
+- BreezeWiki: [https://docs.breezewiki.com/files/instances.json](https://docs.breezewiki.com/files/instances.json)
+- Binternet: [https://github.com/Ahwxorg/Binternet#instances](https://github.com/Ahwxorg/Binternet#instances)
 - Librarian: [https://codeberg.org/librarian/librarian/src/branch/main/instances.json](https://codeberg.org/librarian/librarian/src/branch/main/instances.json)
 - SearXNG, SearX: [https://searx.space](https://searx.space)
 - Whoogle: [https://github.com/benbusby/whoogle-search#public-instances](https://github.com/benbusby/whoogle-search#public-instances)
@@ -28,9 +31,10 @@
 - BiblioReads: [https://github.com/nesaku/BiblioReads/blob/main/instances.json](https://github.com/nesaku/BiblioReads/blob/main/instances.json)
 - Suds: [https://git.vern.cc/cobra/Suds/src/branch/main/instances.json](https://git.vern.cc/cobra/Suds/src/branch/main/instances.json)
 - PokeTube: [https://codeberg.org/Ashley/poketube/src/branch/main/instances.json](https://codeberg.org/Ashley/poketube/src/branch/main/instances.json)
+- Tent: [https://forgejo.sny.sh/sun/Tent#instances](https://forgejo.sny.sh/sun/Tent#instances)
 
 
 ## How to run:
 ```bash
 $ python3 instances.py
-```
\ No newline at end of file
+```
diff --git a/fixed/tent.json b/fixed/tent.json
deleted file mode 100644
index 3ead370..0000000
--- a/fixed/tent.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "clearnet": [
-        "https://tent.sny.sh",
-        "https://tent.bloatcat.tk"
-    ],
-    "tor": [],
-    "i2p": [],
-    "loki": []
-}
\ No newline at end of file
diff --git a/instances.py b/instances.py
index d4da54f..7fe996b 100755
--- a/instances.py
+++ b/instances.py
@@ -323,7 +323,7 @@ def nitter():
             result = re.findall(r"^- <(http.*?)\/?>", line)
             if len(result) > 0:
                 _list['i2p'].append(result[0])
-        
+
         _list['loki'] = []
         public = re.findall(r"## Lokinet((?:\n|.*)+?)##", r.text)
         for line in public[0].split('\n'):
@@ -433,6 +433,11 @@ def rimgo():
                   {'clearnet': 'url', 'tor': 'onion', 'i2p': 'i2p', 'loki': None}, False)
 
 
+def pixivfe():
+    fetchRegexList('pixivfe', 'https://codeberg.org/VnPower/pixivfe/raw/branch/main/README.md',
+                   r"\| (https?:\/{2}(?:\S+\.)+[a-zA-Z0-9]*) +\|")
+
+
 def beatbump():
     fetchFromFile('beatbump')
 
@@ -460,6 +465,11 @@ def breezeWiki():
         'breezeWiki', 'https://docs.breezewiki.com/files/instances.json', 'instance', False)
 
 
+def binternet():
+    fetchRegexList('binternet', 'https://raw.githubusercontent.com/Ahwxorg/Binternet/main/README.md',
+                   r"\| \[[\w\.]+!?\]\((https?:\/{2}(?:\S+\.)+[a-zA-Z0-9]*\/?)\)")
+
+
 def privateBin():
     fetchJsonList('privateBin', 'https://privatebin.info/directory/api?top=100&https_redirect=true&min_rating=A&csp_header=true&min_uptime=100&attachments=true', 'url', False)
 
@@ -560,7 +570,8 @@ def mikuInvidious():
 
 
 def tent():
-    fetchFromFile('tent')
+    fetchRegexList('tent', 'https://forgejo.sny.sh/sun/Tent/raw/branch/main/README.md',
+                   r"- (https?:\/{2}(?:\S+\.)+[a-zA-Z0-9]*\/?)")
 
 
 wolfreeAlpha_url_list = [
@@ -631,11 +642,13 @@ searx()
 whoogle()
 librex()
 rimgo()
+pixivfe()
 beatbump()
 hyperpipe()
 facil()
 osm()
 breezeWiki()
+binternet()
 privateBin()
 neuters()
 ruralDictionary()