Continued:

- lesser direct function imports
- fixed some errors

diff --git a/fba.py b/fba.py
index 8614e32c9f682ce475065b4d0de6db41de9aee37..f0c6f6b8bd3e15dff8f55a67093932d27dbb888e 100644 (file)
--- a/fba.py
+++ b/fba.py
@@ -1,8 +1,6 @@
-from reqto import get
-from reqto import post
 from bs4 import BeautifulSoup
-from reqto import get
 from hashlib import sha256
+import reqto
 import re
 import sqlite3
 import json
@@ -31,7 +29,7 @@ def get_hash(domain: str) -> str:
 
 def get_peers(domain: str) -> str:
     try:
-        res = get(f"https://{domain}/api/v1/instance/peers", headers=headers, timeout=5)
+        res = reqto.get(f"https://{domain}/api/v1/instance/peers", headers=headers, timeout=5)
         return res.json()
     except:
         print("WARNING: Cannot fetch peers:", domain)
@@ -39,13 +37,13 @@ def get_peers(domain: str) -> str:
 
 def get_type(instdomain: str) -> str:
     try:
-        res = get(f"https://{instdomain}/nodeinfo/2.1.json", headers=headers, timeout=5)
+        res = reqto.get(f"https://{instdomain}/nodeinfo/2.1.json", headers=headers, timeout=5)
         if res.status_code == 404:
-            res = get(f"https://{instdomain}/nodeinfo/2.0", headers=headers, timeout=5)
+            res = reqto.get(f"https://{instdomain}/nodeinfo/2.0", headers=headers, timeout=5)
         if res.status_code == 404:
-            res = get(f"https://{instdomain}/nodeinfo/2.0.json", headers=headers, timeout=5)
+            res = reqto.get(f"https://{instdomain}/nodeinfo/2.0.json", headers=headers, timeout=5)
         if res.ok and "text/html" in res.headers["content-type"]:
-            res = get(f"https://{instdomain}/nodeinfo/2.1", headers=headers, timeout=5)
+            res = reqto.get(f"https://{instdomain}/nodeinfo/2.1", headers=headers, timeout=5)
         if res.ok:
             if res.json()["software"]["name"] in ["akkoma", "rebased"]:
                 return "pleroma"
@@ -56,7 +54,7 @@ def get_type(instdomain: str) -> str:
             else:
                 return res.json()["software"]["name"]
         elif res.status_code == 404:
-            res = get(f"https://{instdomain}/api/v1/instance", headers=headers, timeout=5)
+            res = reqto.get(f"https://{instdomain}/api/v1/instance", headers=headers, timeout=5)
         if res.ok:
             return "mastodon"
     except:
@@ -146,7 +144,7 @@ def send_bot_post(instance: str, blocks: dict):
         message = message + "(the list has been truncated to the first 20 entries)"
 
     botheaders = {**headers, **{"Authorization": "Bearer " + config["bot_token"]}}
-    req = post(f"{config['bot_instance']}/api/v1/statuses",
+    req = reqto.post(f"{config['bot_instance']}/api/v1/statuses",
         data={"status":message, "visibility":config['bot_visibility'], "content_type":"text/plain"},
         headers=botheaders, timeout=10).json()
     return True
@@ -178,7 +176,7 @@ def get_mastodon_blocks(domain: str) -> dict:
 
     try:
         doc = BeautifulSoup(
-            get(f"https://{domain}/about/more", headers=headers, timeout=5).text,
+            reqto.get(f"https://{domain}/about/more", headers=headers, timeout=5).text,
             "html.parser",
         )
     except:
@@ -211,7 +209,7 @@ def get_friendica_blocks(domain: str) -> dict:
 
     try:
         doc = BeautifulSoup(
-            get(f"https://{domain}/friendica", headers=headers, timeout=5).text,
+            reqto.get(f"https://{domain}/friendica", headers=headers, timeout=5).text,
             "html.parser",
         )
     except:
@@ -249,10 +247,10 @@ def get_misskey_blocks(domain: str) -> dict:
             # iterating through all "suspended" (follow-only in its terminology) instances page-by-page, since that troonware doesn't support sending them all at once
             try:
                 if counter == 0:
-                    doc = post(f"https://{domain}/api/federation/instances", data=json.dumps({"sort":"+caughtAt","host":None,"suspended":True,"limit":step}), headers=headers, timeout=5).json()
+                    doc = reqto.post(f"https://{domain}/api/federation/instances", data=json.dumps({"sort":"+caughtAt","host":None,"suspended":True,"limit":step}), headers=headers, timeout=5).json()
                     if doc == []: raise
                 else:
-                    doc = post(f"https://{domain}/api/federation/instances", data=json.dumps({"sort":"+caughtAt","host":None,"suspended":True,"limit":step,"offset":counter-1}), headers=headers, timeout=5).json()
+                    doc = reqto.post(f"https://{domain}/api/federation/instances", data=json.dumps({"sort":"+caughtAt","host":None,"suspended":True,"limit":step,"offset":counter-1}), headers=headers, timeout=5).json()
                     if doc == []: raise
                 for instance in doc:
                     # just in case
@@ -273,10 +271,10 @@ def get_misskey_blocks(domain: str) -> dict:
             # same shit, different asshole ("blocked" aka full suspend)
             try:
                 if counter == 0:
-                    doc = post(f"https://{domain}/api/federation/instances", data=json.dumps({"sort":"+caughtAt","host":None,"blocked":True,"limit":step}), headers=headers, timeout=5).json()
+                    doc = reqto.post(f"https://{domain}/api/federation/instances", data=json.dumps({"sort":"+caughtAt","host":None,"blocked":True,"limit":step}), headers=headers, timeout=5).json()
                     if doc == []: raise
                 else:
-                    doc = post(f"https://{domain}/api/federation/instances", data=json.dumps({"sort":"+caughtAt","host":None,"blocked":True,"limit":step,"offset":counter-1}), headers=headers, timeout=5).json()
+                    doc = reqto.post(f"https://{domain}/api/federation/instances", data=json.dumps({"sort":"+caughtAt","host":None,"blocked":True,"limit":step,"offset":counter-1}), headers=headers, timeout=5).json()
                     if doc == []: raise
                 for instance in doc:
                     if instance["isBlocked"]:

diff --git a/fetch_blocks.py b/fetch_blocks.py
index 3338ab0cb31c4ab1832b3765e9146621928cee6c..32449ecad1479d8e8beea96acb2020d11ce69e1b 100644 (file)
--- a/fetch_blocks.py
+++ b/fetch_blocks.py
@@ -1,3 +1,4 @@
+import reqto
 import time
 import bs4
 import fba
@@ -17,7 +18,7 @@ for blocker, software in fba.c.fetchall():
         try:
             # Blocks
             federation = reqto.get(
-                f"https://{blocker}/nodeinfo/2.1.json", headers=headers, timeout=5
+                f"https://{blocker}/nodeinfo/2.1.json", headers=fba.headers, timeout=5
             ).json()["metadata"]["federation"]
             if "mrf_simple" in federation:
                 for block_level, blocks in (
@@ -41,7 +42,7 @@ for blocker, software in fba.c.fetchall():
                                 blocked = searchres[0]
 
                         fba.c.execute(
-                            "SELECT domain FROM instances WHERE domain = ?", (blocked)
+                            "SELECT domain FROM instances WHERE domain = ?", (blocked,)
                         )
 
                         if fba.c.fetchone() == None:
@@ -118,17 +119,17 @@ for blocker, software in fba.c.fetchall():
 
                 # handling CSRF, I've saw at least one server requiring it to access the endpoint
                 meta = bs4.BeautifulSoup(
-                    reqto.get(f"https://{blocker}/about", headers=headers, timeout=5).text,
+                    reqto.get(f"https://{blocker}/about", headers=fba.headers, timeout=5).text,
                     "html.parser",
                 )
                 try:
                     csrf = meta.find("meta", attrs={"name": "csrf-token"})["content"]
-                    reqheaders = {**headers, **{"x-csrf-token": csrf}}
+                    reqfba.headers = {**fba.headers, **{"x-csrf-token": csrf}}
                 except:
-                    reqheaders = headers
+                    reqfba.headers = fba.headers
 
                 blocks = reqto.get(
-                    f"https://{blocker}/api/v1/instance/domain_blocks", headers=reqheaders, timeout=5
+                    f"https://{blocker}/api/v1/instance/domain_blocks", headers=reqfba.headers, timeout=5
                 ).json()
 
                 print("DEBUG: blocks():", len(blocks))
@@ -273,7 +274,7 @@ for blocker, software in fba.c.fetchall():
         try:
             # Blocks
             federation = reqto.get(
-                f"https://{blocker}/api/v1/instance/peers?filter=suspended", headers=headers, timeout=5
+                f"https://{blocker}/api/v1/instance/peers?filter=suspended", headers=fba.headers, timeout=5
             ).json()
 
             if (federation == None):

diff --git a/fetch_instances.py b/fetch_instances.py
index 7b592802365a282c5d47e095f2b9311ccc10f626..207c5caf1bf119581b3be03cca4318f6349119e8 100644 (file)
--- a/fetch_instances.py
+++ b/fetch_instances.py
@@ -38,6 +38,6 @@ for instance in peerlist:
 
         fba.conn.commit()
     except Exception as e:
-        print("error:", e, instance)
+        print("ERROR:", e, instance)
 
 fba.conn.close()