Continued:

[fba.git] / fba / networks / pleroma.py

diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index ebd5b789c1b16f4ec9e892fbdb08a984b3b844ff..1a69c239a7d42d374f7da7968391c790b720a983 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -108,7 +108,7 @@ def fetch_blocks(domain: str) -> list:
             }
         ).items():
             logger.debug("block_level='%s', blocklist()=%d", block_level, len(blocklist))
-            block_level = tidyup.domain(block_level)
+            block_level = tidyup.domain(block_level) if block_level != "" else None
             logger.debug("block_level='%s' - AFTER!", block_level)
 
             if block_level == "":
@@ -124,11 +124,14 @@ def fetch_blocks(domain: str) -> list:
             if len(blocklist) > 0:
                 for blocked in blocklist:
                     logger.debug("blocked='%s' - BEFORE!", blocked)
-                    blocked = tidyup.domain(blocked)
+                    blocked = tidyup.domain(blocked) if blocked != "" else None
                     logger.debug("blocked='%s' - AFTER!", blocked)
 
-                    if blocked == "":
-                        logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s' - SKIPPED!", domain, block_level)
+                    if blocked is None:
+                        logger.warning("blocked is empty - SKIPPED!")
+                        continue
+                    elif blocked == "":
+                        logger.warning("blocked is an empty string after tidyup.domain(): domain='%s',block_level='%s' - SKIPPED!", domain, block_level)
                         continue
 
                     logger.debug("Invoking utils.deobfuscate(%s, %s) ...", blocked, domain)
@@ -154,7 +157,7 @@ def fetch_blocks(domain: str) -> list:
 
         for blocked in data["quarantined_instances"]:
             logger.debug("blocked='%s' - BEFORE!", blocked)
-            blocked = tidyup.domain(blocked)
+            blocked = tidyup.domain(blocked) if blocked != "" else None
             logger.debug("blocked='%s' - AFTER!", blocked)
 
             if blocked == "":
@@ -189,7 +192,7 @@ def fetch_blocks(domain: str) -> list:
             }
         ).items():
             logger.debug("block_level='%s', info.items()=%d", block_level, len(info.items()))
-            block_level = tidyup.domain(block_level)
+            block_level = tidyup.domain(block_level) if block_level != "" else None
             logger.debug("block_level='%s' - AFTER!", block_level)
 
             if block_level == "":
@@ -204,7 +207,7 @@ def fetch_blocks(domain: str) -> list:
             logger.debug("Checking %d entries from domain='%s',block_level='%s' ...", len(info.items()), domain, block_level)
             for blocked, reason in info.items():
                 logger.debug("blocked='%s',reason[%s]='%s' - BEFORE!", blocked, type(reason), reason)
-                blocked = tidyup.domain(blocked)
+                blocked = tidyup.domain(blocked) if blocked != "" else None
                 logger.debug("blocked='%s' - AFTER!", blocked)
 
                 if isinstance(reason, str):
@@ -239,7 +242,7 @@ def fetch_blocks(domain: str) -> list:
         for blocked in rows:
             logger.debug("blocked='%s' - BEFORE!", blocked)
             reason = tidyup.reason(rows[blocked]["reason"])
-            blocked = tidyup.domain(blocked)
+            blocked = tidyup.domain(blocked) if blocked != "" else None
             logger.debug("blocked='%s',reason='%s' - AFTER!", blocked, reason)
 
             if blocked not in rows or "reason" not in rows[blocked]:
@@ -365,8 +368,12 @@ def fetch_blocks_from_about(domain: str) -> dict:
             logger.debug("Found block_level='%s', importing domain blocks ...", block_level)
             for line in header.find_next("table").find_all("tr")[1:]:
                 logger.debug("line[]='%s'", type(line))
-                blocked = tidyup.domain(line.find_all("td")[0].text)
+                blocked = line.find_all("td")[0].text
+                logger.debug("blocked='%s'", blocked)
+
+                blocked = tidyup.domain(blocked) if blocked != "" else None
                 reason = tidyup.reason(line.find_all("td")[1].text)
+                logger.debig("blocked='%s',reason='%s' - AFTER!", blocked, reason)
 
                 if blocked is None or blocked == "":
                     logger.debug("domain='%s',block_level='%s': blocked is empty - SKIPPED!", domain, block_level)