Continued:

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

diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index 1a69c239a7d42d374f7da7968391c790b720a983..5f403b9931eb1698a1cea68d2d138c2e5da69ea9 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -127,11 +127,8 @@ def fetch_blocks(domain: str) -> list:
                     blocked = tidyup.domain(blocked) if blocked != "" else None
                     logger.debug("blocked='%s' - AFTER!", blocked)
 
-                    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)
+                    if blocked is None or blocked == "":
+                        logger.warning("blocked='%s' is empty after tidyup.domain(): domain='%s',block_level='%s' - SKIPPED!", blocked, domain, block_level)
                         continue
 
                     logger.debug("Invoking utils.deobfuscate(%s, %s) ...", blocked, domain)
@@ -158,9 +155,9 @@ def fetch_blocks(domain: str) -> list:
         for blocked in data["quarantined_instances"]:
             logger.debug("blocked='%s' - BEFORE!", blocked)
             blocked = tidyup.domain(blocked) if blocked != "" else None
-            logger.debug("blocked='%s' - AFTER!", blocked)
 
-            if blocked == "":
+            logger.debug("blocked='%s' - AFTER!", blocked)
+            if blocked is None or blocked == "":
                 logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
                 continue
             elif not domain_helper.is_wanted(blocked):