From f454ced9490309f37199c2a47dcd8cbc7e976798 Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Wed, 7 Dec 2022 10:51:43 +0300
Subject: Removed LatencyTest, AutoRedirect, Unify, DisableInstance

---
 src/instances/get_instances.py | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'src/instances/get_instances.py')

diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py
index 913ee1c4..65b1fc44 100755
--- a/src/instances/get_instances.py
+++ b/src/instances/get_instances.py
@@ -117,21 +117,6 @@ def is_authenticate(url):
         return False
     return False
 
-
-def is_offline(url):
-    try:
-        r = requests.get(url, timeout=5, headers=headers)
-        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 Exception:
-        return False
-
-
 def fetchCache(frontend, name):
     try:
         with open('./src/instances/data.json') as file:
@@ -524,7 +509,6 @@ mightyList = idnaEncode(mightyList)
 
 cloudflare = []
 authenticate = []
-offline = []
 for k1, v1 in mightyList.items():
     if type(mightyList[k1]) is dict:
         for k2, v2 in mightyList[k1].items():
@@ -537,15 +521,12 @@ 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)
-                    elif 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,
-    'offline': offline
 }
 
 # Writing to file
-- 
cgit 1.4.1


From 3d0e12cd4ca2910ed2d03f0439f61bbce6180af3 Mon Sep 17 00:00:00 2001
From: Jacob Parnell <jparnell@mailfence.com>
Date: Wed, 7 Dec 2022 19:02:58 -0600
Subject: Fix instance fetching for BreezeWiki

---
 src/instances/get_instances.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/instances/get_instances.py')

diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py
index 65b1fc44..8121cea5 100755
--- a/src/instances/get_instances.py
+++ b/src/instances/get_instances.py
@@ -442,9 +442,7 @@ def libreTranslate():
 
 
 def breezeWiki():
-    fetchRegexList('breezeWiki', 'BreezeWiki', 'https://gitdab.com/cadence/breezewiki-docs/raw/branch/main/docs.scrbl',
-                   r"\(\"[^\n\s\r\t\f\v\"]+\" \"https?:\/{2}(?:[^\s\/]+\.)+[a-zA-Z0-9]+(?:\/[^\s\/]+)*\" \"(https?:\/{2}(?:[^\s\/]+\.)+[a-zA-Z0-9]+(?:\/[^\s\/]+)*)\"\)")
-
+    fetchJsonList('breezeWiki', 'BreezeWiki', 'https://docs.breezewiki.com/files/instances.json', 'instance', False)
 
 def privateBin():
     fetchJsonList('privateBin', 'PrivateBin',
-- 
cgit 1.4.1