Continued:

- "get" should be used only for getters
- removed variable "get_peers_url" which was used only once in code

diff --git a/fba/fba.py b/fba/fba.py
index 9a8b3d7319c689f4c1487bebf27084f4c73509a2..e52ddc36eeaaad55f4621d5bcc437359c993a89c 100644 (file)
--- a/fba/fba.py
+++ b/fba/fba.py
@@ -63,9 +63,6 @@ api_headers = {
     "Content-Type": "application/json",
 }
 
-# URL for fetching peers
-get_peers_url = "/api/v1/instance/peers"
-
 # Connect to database
 connection = sqlite3.connect("blocks.db")
 cursor = connection.cursor()
@@ -106,7 +103,7 @@ def fetch_instances(domain: str, origin: str, software: str, script: str, path:
         instances.add(domain, origin, script, path)
 
     # DEBUG: print("DEBUG: Fetching instances for domain:", domain, software)
-    peerlist = get_peers(domain, software)
+    peerlist = fetch_peers(domain, software)
 
     if (peerlist is None):
         print("ERROR: Cannot fetch peers:", domain)
@@ -343,7 +340,7 @@ def log_error(domain: str, response: requests.models.Response):
 
     # DEBUG: print("DEBUG: EXIT!")
 
-def get_peers(domain: str, software: str) -> list:
+def fetch_peers(domain: str, software: str) -> list:
     # DEBUG: print(f"DEBUG: domain({len(domain)})={domain},software={software} - CALLED!")
     if type(domain) != str:
         raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
@@ -353,25 +350,25 @@ def get_peers(domain: str, software: str) -> list:
         raise ValueError(f"software[]={type(software)} is not 'str'")
 
     if software == "misskey":
-        # DEBUG: print(f"DEBUG: Invoking misskey.get_peers({domain}) ...")
-        return misskey.get_peers(domain)
+        # DEBUG: print(f"DEBUG: Invoking misskey.fetch_peers({domain}) ...")
+        return misskey.fetch_peers(domain)
     elif software == "lemmy":
-        # DEBUG: print(f"DEBUG: Invoking lemmy.get_peers({domain}) ...")
-        return lemmy.get_peers(domain)
+        # DEBUG: print(f"DEBUG: Invoking lemmy.fetch_peers({domain}) ...")
+        return lemmy.fetch_peers(domain)
     elif software == "peertube":
-        # DEBUG: print(f"DEBUG: Invoking peertube.get_peers({domain}) ...")
-        return peertube.get_peers(domain)
+        # DEBUG: print(f"DEBUG: Invoking peertube.fetch_peers({domain}) ...")
+        return peertube.fetch_peers(domain)
 
-    # DEBUG: print(f"DEBUG: Fetching get_peers_url='{get_peers_url}' from '{domain}',software='{software}' ...")
+    # DEBUG: print(f"DEBUG: Fetching peers from '{domain}',software='{software}' ...")
     peers = list()
     try:
-        response = get_response(domain, get_peers_url, api_headers, (config.get("connection_timeout"), config.get("read_timeout")))
+        response = get_response(domain, "/api/v1/instance/peers", api_headers, (config.get("connection_timeout"), config.get("read_timeout")))
 
         data = json_from_response(response)
 
         # DEBUG: print(f"DEBUG: response.ok={response.ok},response.status_code={response.status_code},data[]='{type(data)}'")
         if not response.ok or response.status_code >= 400:
-            # DEBUG: print(f"DEBUG: Was not able to fetch '{get_peers_url}', trying alternative ...")
+            # DEBUG: print(f"DEBUG: Was not able to fetch peers, trying alternative ...")
             response = get_response(domain, "/api/v3/site", api_headers, (config.get("connection_timeout"), config.get("read_timeout")))
 
             data = json_from_response(response)

diff --git a/fba/federation/gotosocial.py b/fba/federation/gotosocial.py
index 00a367f3b95b3d058507aac6b5d93c212437c0eb..0b10756afd96ba5ff32d2a4eb7b979483bcc9bc1 100644 (file)
--- a/fba/federation/gotosocial.py
+++ b/fba/federation/gotosocial.py
@@ -40,7 +40,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
     try:
         # Blocks
-        federation = fba.get_response(domain, f"{fba.get_peers_url}?filter=suspended", fba.api_headers, (config.get("connection_timeout"), config.get("read_timeout"))).json()
+        federation = fba.get_response(domain, f"{fba.fetch_peers_url}?filter=suspended", fba.api_headers, (config.get("connection_timeout"), config.get("read_timeout"))).json()
 
         if (federation == None):
             print("WARNING: No valid response:", domain);

diff --git a/fba/federation/lemmy.py b/fba/federation/lemmy.py
index 46b2b8e876f39faf732e4465b67afbf696548c47..8f7ce567367b41e0119ff0cd9297446f496e155a 100644 (file)
--- a/fba/federation/lemmy.py
+++ b/fba/federation/lemmy.py
@@ -18,7 +18,7 @@ from fba import config
 from fba import fba
 from fba import instances
 
-def get_peers(domain: str) -> list:
+def fetch_peers(domain: str) -> list:
     # DEBUG: print(f"DEBUG: domain({len(domain)})={domain},software='lemmy' - CALLED!")
     if type(domain) != str:
         raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")

diff --git a/fba/federation/misskey.py b/fba/federation/misskey.py
index a995b143f04bfdd78e6d1e33464ef06f39823a59..1428948cf8c8f7fd54a0f6f5dd0eb3b3b27cbcbe 100644 (file)
--- a/fba/federation/misskey.py
+++ b/fba/federation/misskey.py
@@ -21,7 +21,7 @@ from fba import config
 from fba import fba
 from fba import instances
 
-def get_peers(domain: str) -> list:
+def fetch_peers(domain: str) -> list:
     # DEBUG: print(f"DEBUG: domain({len(domain)})={domain} - CALLED!")
     if type(domain) != str:
         raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")

diff --git a/fba/federation/peertube.py b/fba/federation/peertube.py
index 8e839e373c60b59fa3d4eb43b3b95c403e8dd87c..da50cf3886468a0dda0b3018333ee864ba07ca41 100644 (file)
--- a/fba/federation/peertube.py
+++ b/fba/federation/peertube.py
@@ -18,7 +18,7 @@ from fba import config
 from fba import fba
 from fba import instances
 
-def get_peers(domain: str) -> list:
+def fetch_peers(domain: str) -> list:
     # DEBUG: print(f"DEBUG: domain({len(domain)})={domain},software='peertube' - CALLED!")
     if type(domain) != str:
         raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")