Continued:

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

diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index 41d8500ecdbd7e7f1d0d05a14bc6ca133722036f..c637f65a9d0e59b6c45697b381cbb67e94da89f2 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -129,7 +129,7 @@ def fetch_blocks(domain: str) -> list:
                 blocked = tidyup.domain(blocked) if blocked != "" else None
                 logger.debug("blocked='%s' - AFTER!", blocked)
 
-                if blocked is None or blocked == "":
+                if blocked in [None, ""]:
                     logger.warning("blocked='%s' is empty after tidyup.domain(): domain='%s',block_level='%s' - SKIPPED!", blocked, domain, block_level)
                     continue
 
@@ -137,7 +137,7 @@ def fetch_blocks(domain: str) -> list:
                 blocked = utils.deobfuscate(blocked, domain)
                 logger.debug("blocked='%s' - DEOBFUSCATED!", blocked)
 
-                if blocked is None or blocked == "":
+                if blocked in [None, ""]:
                     logger.warning("instance[host]='%s' is None or empty after tidyup.domain() - SKIPPED!", instance["host"])
                     continue
                 elif not domain_helper.is_wanted(blocked):
@@ -163,7 +163,7 @@ def fetch_blocks(domain: str) -> list:
             blocked = tidyup.domain(blocked) if blocked != "" else None
 
             logger.debug("blocked='%s' - AFTER!", blocked)
-            if blocked is None or blocked == "":
+            if blocked in [None, ""]:
                 logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
                 continue
             elif not domain_helper.is_wanted(blocked):
@@ -198,7 +198,7 @@ def fetch_blocks(domain: str) -> list:
             block_level = tidyup.domain(block_level) if block_level != "" else None
             logger.debug("block_level='%s' - AFTER!", block_level)
 
-            if block_level is None or block_level == "":
+            if block_level in [None, ""]:
                 logger.warning("block_level='%s' is now empty!", block_level)
                 continue
             elif block_level == "accept":