Rollback master to pre-OOP

.woodpecker/instances.yml

@@ -0,0 +1,23 @@
+pipeline:
+  instancefetch:
+    image: python:3.8
+    secrets: [token, mail]
+    when:
+      event: cron
+    commands:
+      - python -m pip install --upgrade pip
+      - pip install requests bs4 colorama
+      - python src/instances/get_instances.py
+      # Git configuration
+      - git config --global user.email $MAIL
+      - git config --global user.name "Woodpecker CI"
+      - git commit -am "updated instances"
+      - mkdir ~/.ssh
+      - ssh-keyscan -t ed25519 codeberg.org >> ~/.ssh/known_hosts
+      - git remote set-url origin git@codeberg.org:libredirect/libredirect.git
+        #- echo $TOKEN > key
+        #- chmod 0600 key
+      - eval `ssh-agent`
+      - echo "$TOKEN" | tr -d '\r' | ssh-add -
+        #- ssh-add key
+      - git push --set-upstream origin master

README.md

@@ -36,7 +36,7 @@ Send Files => [Send](https://gitlab.com/timvisee/send)
 
 **Note**: The Extension will be using random instances by default. You can modify this and add custom instances too.
 
-[FAQ](https://libredirect.github.io/faq.html)
+# Please read the [FAQ](https://libredirect.github.io/faq.html) if you have any questions!
 
 ## Donate
 

src/instances/beatbump.json

@@ -1,9 +1,6 @@
 {
-	"normal": [
+	"normal": ["https://beatbump.ml", "https://beatbump.esmailelbob.xyz"],
-		"https://beatbump.ml",
+	"tor": ["http://beatbump.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion"],
-		"https://beatbump.esmailelbob.xyz"
-	],
-	"tor": [],
 	"i2p": [],
 	"loki": []
 }

src/instances/bibliogram.json

@@ -0,0 +1,6 @@
+{
+	"normal": ["https://bibliogram.1d4.us", "https://bibliogram.froth.zone", "https://ig.tokhmi.xyz", "https://ig.beparanoid.de", "https://bibliogram.priv.pw"],
+	"tor": [],
+	"i2p": [],
+	"loki": []
+}

src/instances/get_instances.py

@@ -230,16 +230,9 @@ def nitter():
 
 
 def bibliogram():
-    r = requests.get('https://bibliogram.art/api/instances')
+    json_object = json.dumps(mightyList, ensure_ascii=False, indent=2)
-    rJson = json.loads(r.text)
+    with open('./src/instances/bibliogram.json') as file:
-    bibliogramList = {}
+        mightyList['bibliogram'] = json.load(file)
-    bibliogramList['normal'] = []
-    bibliogramList['tor'] = []
-    bibliogramList['i2p'] = []
-    bibliogramList['loki'] = []
-    for item in rJson['data']:
-        bibliogramList['normal'].append(item['address'])
-    mightyList['bibliogram'] = bibliogramList
     print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Bibliogram')