From 3517fbab5a678c3ced57b9ab210544f345115576 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 1 Aug 2025 18:49:02 +0200 Subject: [PATCH] Continued: - mastodon: let obfuscated domains be added to queue, they will be deobfuscated in main loop(s) anyway --- fba/networks/friendica.py | 2 +- fba/networks/gotosocial.py | 2 +- fba/networks/mastodon.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fba/networks/friendica.py b/fba/networks/friendica.py index f80d1d8..74d4e70 100644 --- 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 6b7d5ec..10cd72b 100644 --- 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 0500d95..a08c823 100644 --- 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"]: -- 2.39.5