Continued:

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

diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index bdccdc2997414657599f216267393a9882aeaa54..3769feec08f0611595c38894913d21514390edc5 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -126,7 +126,7 @@ def fetch_blocks(domain: str) -> list:
                 logger.debug("blocked='%s' - AFTER!", blocked)
 
                 if blocked in [None, ""]:
-                    logger.warning("blocked='%s' is empty after tidyup.domain(): domain='%s',block_level='%s' - SKIPPED!", blocked, domain, block_level)
+                    logger.warning("blocked[%s]='%s' is empty after tidyup.domain(): domain='%s',block_level='%s' - SKIPPED!", blocked, domain, block_level)
                     continue
                 elif validators.domain(blocked) and blacklist.is_blacklisted(blocked):
                     logger.debug("blocked='%s' is blacklisted - SKIPPED!")
@@ -163,7 +163,7 @@ def fetch_blocks(domain: str) -> list:
             logger.debug("blocked='%s' - AFTER!", blocked)
 
             if blocked in [None, ""]:
-                logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
+                logger.warning("blocked[%s]='%s' is empty after tidyup.domain(): domain='%s',block_level='%s'", type(blocked), blocked, domain, block_level)
                 continue
             elif not domain_helper.is_wanted(blocked):
                 logger.debug("blocked='%s' is not wanted - SKIPPED!", blocked)
@@ -223,8 +223,8 @@ def fetch_blocks(domain: str) -> list:
 
                 logger.debug("blocked='%s',reason='%s' - AFTER!", blocked, reason)
 
-                if blocked == "":
-                    logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
+                if blocked in [None, ""]:
+                    logger.warning("blocked[%s]='%s' is empty after tidyup.domain(): domain='%s',block_level='%s'", type(blocked), blocked, domain, block_level)
                     continue
 
                 logger.debug("Checking %d blockdict records ...", len(blockdict))
@@ -250,8 +250,8 @@ def fetch_blocks(domain: str) -> list:
             if blocked not in rows or "reason" not in rows[blocked]:
                 logger.warning("Cannot find blocked='%s' in rows()=%d,domain='%s' - BREAK!", blocked, len(rows), domain)
                 break
-            elif blocked == "":
-                logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
+            elif blocked in [None, ""]:
+                logger.warning("blocked[%s]='%s' is empty after tidyup.domain(): domain='%s',block_level='%s'", type(blocked), blocked, domain, block_level)
                 continue
 
             logger.debug("Checking %d blockdict record(s) ...", len(blockdict))