Continued:

- mastodon: let obfuscated domains be added to queue, they will be deobfuscated
  in main loop(s) anyway

diff --git a/fba/networks/friendica.py b/fba/networks/friendica.py
index f80d1d82f1496c471f160cf2d3a5cb6304cebdbc..74d4e7039d2a6b5a8405a5b40a97eaf6a6770cc7 100644 (file)
--- a/fba/networks/friendica.py
+++ b/fba/networks/friendica.py
@@ -75,7 +75,7 @@ def fetch_blocks(domain: str) -> list:
 
     logger.debug("table[]='%s'", type(table))
     if table is None:
-        logger.warning("domain='%s' has no table tag - EXIT !", domain)
+        logger.warning("domain='%s' has no table tag - EXIT!", domain)
         return []
 
     # Find all rows in table

diff --git a/fba/networks/gotosocial.py b/fba/networks/gotosocial.py
index 6b7d5ec682702163b8631ef779c53d17bb3d0008..10cd72b6c8cb97c1a9e7e1e5deca3acbb52d0687 100644 (file)
--- a/fba/networks/gotosocial.py
+++ b/fba/networks/gotosocial.py
@@ -75,7 +75,7 @@ def fetch_blocks(domain: str) -> list:
 
     logger.debug("table[]='%s'", type(table))
     if table is None:
-        logger.warning("domain='%s' has no table tag - EXIT !", domain)
+        logger.warning("domain='%s' has no table tag - EXIT!", domain)
         return []
 
     # Find all rows in table

diff --git a/fba/networks/mastodon.py b/fba/networks/mastodon.py
index 0500d957da7f9def2126e5db1c9af03c32f7df93..a08c823fe0f3d9d3db26f5308232da79e0ffd048 100644 (file)
--- a/fba/networks/mastodon.py
+++ b/fba/networks/mastodon.py
@@ -195,7 +195,7 @@ def fetch_blocks(domain: str) -> list:
             if not isinstance(block, dict):
                 logger.debug("block[]='%s' is of type 'dict' - SKIPPED!", type(block))
                 continue
-            elif not domain_helper.is_wanted(block["domain"]):
+            elif not block["domain"].find("*") == -1 and block["domain"].find("?") == -1 and domain_helper.is_wanted(block["domain"]):
                 logger.debug("block[domain]='%s' is not wanted - SKIPPED!", block["domain"])
                 continue
             elif block_level in ["accept", "accepted"]: