WIP:

[fba.git] / fba / federation / misskey.py

diff --git a/fba/federation/misskey.py b/fba/federation/misskey.py
index 325c5284d8e80138f345cd98e5041ba95fd3fc14..9e5c9af91be977846162f7e35690b94a46b00330 100644 (file)
--- a/fba/federation/misskey.py
+++ b/fba/federation/misskey.py
@@ -20,13 +20,14 @@ from fba import blacklist
 from fba import config
 from fba import fba
 from fba import instances
+from fba import network
 
 def fetch_peers(domain: str) -> list:
     # DEBUG: print(f"DEBUG: domain({len(domain)})={domain} - CALLED!")
-    if type(domain) != str:
+    if not isinstance(domain, str):
         raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
     elif domain == "":
-        raise ValueError(f"Parameter 'domain' is empty")
+        raise ValueError("Parameter 'domain' is empty")
 
     # DEBUG: print(f"DEBUG: domain='{domain}' is misskey, sending API POST request ...")
     peers = list()
@@ -39,7 +40,7 @@ def fetch_peers(domain: str) -> list:
     while True:
         # DEBUG: print(f"DEBUG: Fetching offset='{offset}' from '{domain}' ...")
         if offset == 0:
-            fetched = fba.post_json_api(domain, "/api/federation/instances", json.dumps({
+            fetched = network.post_json_api(domain, "/api/federation/instances", json.dumps({
                 "sort" : "+pubAt",
                 "host" : None,
                 "limit": step
@@ -47,7 +48,7 @@ def fetch_peers(domain: str) -> list:
                 "Origin": domain
             })
         else:
-            fetched = fba.post_json_api(domain, "/api/federation/instances", json.dumps({
+            fetched = network.post_json_api(domain, "/api/federation/instances", json.dumps({
                 "sort"  : "+pubAt",
                 "host"  : None,
                 "limit" : step,
@@ -80,7 +81,7 @@ def fetch_peers(domain: str) -> list:
             if not "host" in row:
                 print(f"WARNING: row()={len(row)} does not contain key 'host': {row},domain='{domain}'")
                 continue
-            elif type(row["host"]) != str:
+            elif not isinstance(row["host"], str):
                 print(f"WARNING: row[host][]={type(row['host'])} is not 'str'")
                 continue
             elif blacklist.is_blacklisted(row["host"]):
@@ -99,7 +100,7 @@ def fetch_peers(domain: str) -> list:
             break
 
     # DEBUG: print(f"DEBUG: Adding '{len(peers)}' for domain='{domain}'")
-    instances.set("total_peers", domain, len(peers))
+    instances.set_data("total_peers", domain, len(peers))
 
     # DEBUG: print(f"DEBUG: Updating last_instance_fetch for domain='{domain}' ...")
     instances.update_last_instance_fetch(domain)
@@ -109,10 +110,10 @@ def fetch_peers(domain: str) -> list:
 
 def fetch_blocks(domain: str) -> dict:
     # DEBUG: print(f"DEBUG: domain='{domain}' - CALLED!")
-    if type(domain) != str:
+    if not isinstance(domain, str):
         raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
     elif domain == "":
-        raise ValueError(f"Parameter 'domain' is empty")
+        raise ValueError("Parameter 'domain' is empty")
 
     # DEBUG: print("DEBUG: Fetching misskey blocks from domain:", domain)
     blocklist = {
@@ -130,7 +131,7 @@ def fetch_blocks(domain: str) -> dict:
             # DEBUG: print(f"DEBUG: Fetching offset='{offset}' from '{domain}' ...")
             if offset == 0:
                 # DEBUG: print("DEBUG: Sending JSON API request to domain,step,offset:", domain, step, offset)
-                fetched = fba.post_json_api(domain, "/api/federation/instances", json.dumps({
+                fetched = network.post_json_api(domain, "/api/federation/instances", json.dumps({
                     "sort"     : "+pubAt",
                     "host"     : None,
                     "suspended": True,
@@ -140,7 +141,7 @@ def fetch_blocks(domain: str) -> dict:
                 })
             else:
                 # DEBUG: print("DEBUG: Sending JSON API request to domain,step,offset:", domain, step, offset)
-                fetched = fba.post_json_api(domain, "/api/federation/instances", json.dumps({
+                fetched = network.post_json_api(domain, "/api/federation/instances", json.dumps({
                     "sort"     : "+pubAt",
                     "host"     : None,
                     "suspended": True,
@@ -176,12 +177,12 @@ def fetch_blocks(domain: str) -> dict:
 
             # DEBUG: print(f"DEBUG: count={count}")
             if count == 0:
-                # DEBUG: print(f"DEBUG: API is no more returning new instances, aborting loop!")
+                # DEBUG: print("DEBUG: API is no more returning new instances, aborting loop!")
                 break
 
-        except BaseException as e:
-            print("WARNING: Caught error, exiting loop:", domain, e)
-            instances.update_last_error(domain, e)
+        except BaseException as exception:
+            print("WARNING: Caught error, exiting loop:", domain, exception)
+            instances.update_last_error(domain, exception)
             offset = 0
             break
 
@@ -190,7 +191,7 @@ def fetch_blocks(domain: str) -> dict:
         try:
             if offset == 0:
                 # DEBUG: print("DEBUG: Sending JSON API request to domain,step,offset:", domain, step, offset)
-                fetched = fba.post_json_api(domain, "/api/federation/instances", json.dumps({
+                fetched = network.post_json_api(domain, "/api/federation/instances", json.dumps({
                     "sort"   : "+pubAt",
                     "host"   : None,
                     "blocked": True,
@@ -200,7 +201,7 @@ def fetch_blocks(domain: str) -> dict:
                 })
             else:
                 # DEBUG: print("DEBUG: Sending JSON API request to domain,step,offset:", domain, step, offset)
-                fetched = fba.post_json_api(domain, "/api/federation/instances", json.dumps({
+                fetched = network.post_json_api(domain, "/api/federation/instances", json.dumps({
                     "sort"   : "+pubAt",
                     "host"   : None,
                     "blocked": True,
@@ -233,12 +234,12 @@ def fetch_blocks(domain: str) -> dict:
 
             # DEBUG: print(f"DEBUG: count={count}")
             if count == 0:
-                # DEBUG: print(f"DEBUG: API is no more returning new instances, aborting loop!")
+                # DEBUG: print("DEBUG: API is no more returning new instances, aborting loop!")
                 break
 
-        except BaseException as e:
-            print("ERROR: Exception during POST:", domain, e)
-            instances.update_last_error(domain, e)
+        except BaseException as exception:
+            print("ERROR: Exception during POST:", domain, exception)
+            instances.update_last_error(domain, exception)
             offset = 0
             break