Continued/WIP:

- in commands.fetch_instances() added initialization of variables 'rows'
- also moved fetching rows into if() block
- commented some more code

diff --git a/fba/commands.py b/fba/commands.py
index 8d176af495fd68f4150f00285f3a93fc65b4089b..8da03313c5b44c637a1e94ecfff87a51d5767203 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -958,6 +958,9 @@ def fetch_instances(args: argparse.Namespace) -> int:
     logger.debug("Invoking locking.acquire() ...")
     locking.acquire()
 
+    # Init variables
+    rows = list()
+
     # Is domain or software set?
     if args.domain != "":
         logger.debug("args.domain='%s' - checking ...", args.domain)
@@ -974,8 +977,8 @@ def fetch_instances(args: argparse.Namespace) -> int:
 
         # Fetch record
         database.cursor.execute("SELECT domain, origin, software FROM instances WHERE domain = ? LIMIT 1", [domain])
+        rows = database.cursor.fetchall()
 
-    rows = database.cursor.fetchall()
     logger.info("Checking %d entries ...", len(rows))
     for row in rows:
         logger.debug("row[domain]='%s',row[origin]='%s',row[software]='%s'", row["domain"], row["origin"], row["software"])

diff --git a/fba/http/federation.py b/fba/http/federation.py
index 2c35fc65887373b84dcf368329dbcc46e25b2d5b..fbb7f74954286d98bba516a8fcf866ca2374e54f 100644 (file)
--- a/fba/http/federation.py
+++ b/fba/http/federation.py
@@ -538,7 +538,9 @@ def add_peers(rows: dict) -> list:
     elif len(rows) == 0:
         raise ValueError("Parameter 'rows' is empty")
 
+    # Init variables
     peers = list()
+
     for key in ["linked", "allowed", "blocked"]:
         logger.debug("key='%s'", key)
         if key not in rows or rows[key] is None:
@@ -553,7 +555,7 @@ def add_peers(rows: dict) -> list:
                 continue
             elif isinstance(peer, dict) and "domain" in peer:
                 logger.debug("peer[domain]='%s'", peer["domain"])
-                peer = tidyup.domain(peer["domain"])
+                peer = tidyup.domain(peer["domain"]) if peer["domain"] != "" else None
             elif isinstance(peer, str):
                 logger.debug("peer='%s'", peer)
                 peer = tidyup.domain(peer)

diff --git a/fba/networks/mastodon.py b/fba/networks/mastodon.py
index e7d00b6e667c04ee3eb3fb9eb6799af20f4b5fb2..0f5953b61f14e613ad6515c35309417fa51b4ed5 100644 (file)
--- a/fba/networks/mastodon.py
+++ b/fba/networks/mastodon.py
@@ -69,8 +69,10 @@ def fetch_blocks_from_about(domain: str) -> dict:
     elif not instances.is_registered(domain):
         raise Exception(f"domain='{domain}' is not registered but function is invoked.")
 
-    logger.info("Fetching mastodon blocks from domain='%s'", domain)
+    # Init variables
     doc = None
+
+    logger.info("Fetching mastodon blocks from domain='%s'", domain)
     for path in ["/about/more", "/about"]:
         try:
             logger.debug("Fetching path='%s' from domain='%s' ...", path, domain)
@@ -156,6 +158,7 @@ def fetch_blocks(domain: str) -> list:
     elif not instances.is_registered(domain):
         raise Exception(f"domain='{domain}' is not registered but function is invoked.")
 
+    # Init variables
     blocklist = list()
 
     logger.debug("Invoking fetch_blocks_from_about(%s) ...", domain)

diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index 6ee00a6b83ab428f99f66dfcbbf5416484ec0cb3..4126999e8f08ea466980b4cfa3b5bd2cb1dc6f9a 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -61,6 +61,7 @@ def fetch_blocks(domain: str) -> list:
     elif not instances.is_registered(domain):
         raise Exception(f"domain='{domain}' is not registered but function is invoked.")
 
+    # Init variables
     blockdict = list()
     rows = None
 
@@ -269,6 +270,7 @@ def fetch_blocks(domain: str) -> list:
     else:
         logger.warning("Cannot find 'mrf_simple_info' or 'quarantined_instances_info' in JSON reply: domain='%s'", domain)
 
+    logger.debug("found='%s'", found)
     if not found:
         logger.debug("Did not find any useable JSON elements, domain='%s', continuing with /about page ...", domain)
         blocklist = fetch_blocks_from_about(domain)
@@ -299,8 +301,10 @@ def fetch_blocks_from_about(domain: str) -> dict:
     elif not instances.is_registered(domain):
         raise Exception(f"domain='{domain}' is not registered but function is invoked.")
 
-    logger.debug("Fetching mastodon blocks from domain='%s'", domain)
+    # Init variables
     doc = None
+
+    logger.debug("Fetching mastodon blocks from domain='%s'", domain)
     for path in ["/instance/about/index.html"]:
         try:
             # Resetting doc type
@@ -378,9 +382,9 @@ def fetch_blocks_from_about(domain: str) -> dict:
                 blocked = line.find_all("td")[0].text
                 reason  = line.find_all("td")[1].text
 
-                logger.debug("blocked='%s',reason='%s'", blocked, reason)
+                logger.debug("blocked='%s',reason='%s' - BEFORE!", blocked, reason)
                 blocked = tidyup.domain(blocked) if blocked != "" else None
-                reason = tidyup.reason(reason) if reason != "" else None
+                reason  = tidyup.reason(reason)  if reason  != "" else None
                 logger.debug("blocked='%s',reason='%s' - AFTER!", blocked, reason)
 
                 if blocked in [None, ""]: