Continued:

- instances.social suddenly sends domains with TLD .arpa, need to block them

diff --git a/fba/commands.py b/fba/commands.py
index e4bbeaec8a468dc2efaf2be62c20de43940e952d..ee25de6b8ba0133185892d698e2a0b639edc4920 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -1693,6 +1693,9 @@ def fetch_instances_social(args: argparse.Namespace) -> int:
         if domain in [None, ""]:
             logger.debug("domain[%s]='%s' is empty after tidyup.domain() - SKIPPED!", type(domain), domain)
             continue
+        elif not domain_helper.is_tld_wanted(domain):
+            logger.warning("domain='%s' has an unwanted TLD -SKIPPED!", domain)
+            continue
 
         logger.debug("domain='%s' - BEFORE!", domain)
         domain = domain_helper.encode_idna(domain)

diff --git a/fba/helpers/software.py b/fba/helpers/software.py
index a258a517f11b5a8c3aeaae3a2d3963885e865418..2a64cc7f71d486cccff9bd71319804ff9449138e 100644 (file)
--- a/fba/helpers/software.py
+++ b/fba/helpers/software.py
@@ -62,6 +62,7 @@ _misskey_aliases = [
     "hajkey",
     "sharkey",
     "renekey",
+    "quollkey",
     "renekey-lite",
     "yoiyami",
     "catnip",
@@ -176,6 +177,9 @@ def alias(software: str) -> str:
     elif "gnu social" in cleared:
         logger.debug("Setting gnusocial: cleared='%s'", cleared)
         cleared = "gnusocial"
+    elif "ed! thomas" in cleared:
+        logger.debug("Setting wordpress: cleared='%s'", cleared)
+        cleared = "wordpress"
     elif cleared.find("/") > 0:
         logger.warning("Spliting of slash: cleared='%s'", cleared)
         cleared = cleared.split("/")[-1]