Continued:

- added missing parameter for SQL queries
- added some aliases for misskey

diff --git a/fba/commands.py b/fba/commands.py
index df6677fcd513d8ae34c51c92f68c419fc39d2f9f..77de357827d259207efc23c03b1971f2e330accd 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -1470,10 +1470,10 @@ def update_nodeinfo(args: argparse.Namespace) -> int:
         database.cursor.execute("SELECT domain, software FROM instances WHERE domain = ? LIMIT 1", [args.domain])
     elif args.software is not None and args.software != "":
         logger.info("Fetching domains for args.software='%s'", args.software)
-        database.cursor.execute("SELECT domain, software FROM instances WHERE software = ? ORDER BY last_updated ASC")
+        database.cursor.execute("SELECT domain, software FROM instances WHERE software = ? ORDER BY last_updated ASC", [args.software])
     elif args.mode is not None and args.mode != "":
         logger.info("Fetching domains for args.mode='%s'", args.mode.upper())
-        database.cursor.execute("SELECT domain, software FROM instances WHERE detection_mode = ? ORDER BY last_updated ASC")
+        database.cursor.execute("SELECT domain, software FROM instances WHERE detection_mode = ? ORDER BY last_updated ASC", [args.mode])
     elif args.no_software:
         logger.info("Fetching domains with no software type detected ...")
         database.cursor.execute("SELECT domain, software FROM instances WHERE software IS NULL ORDER BY last_updated ASC")

diff --git a/fba/helpers/software.py b/fba/helpers/software.py
index 29da2b6c6678e7ee348827383b3e89b104993a38..50e9402b13a86c6e10eb389f70982ea96190bb18 100644 (file)
--- a/fba/helpers/software.py
+++ b/fba/helpers/software.py
@@ -50,7 +50,7 @@ def alias(software: str) -> str:
     elif software in ["hometown", "ecko", "fedibird", "glitchcafe"] or "되는 마스토돈" in software or "mastodon" in software:
         logger.debug("Setting mastodon: software='%s'", software)
         software = "mastodon"
-    elif software in ["slipfox calckey", "calckey", "groundpolis", "foundkey", "cherrypick", "meisskey", "magnetar", "keybump", "dolphin", "calckey social", "azk.sns", "firefish", "qtmmsky", "iceshrimp", "owohub", "re＋", "russkey", "loverskey", "hajkey", "sharkey"] or "shumihub" in software or "мисскей" in software or "milkey" in software or "misskey" in software:
+    elif software in ["slipfox calckey", "calckey", "groundpolis", "foundkey", "cherrypick", "meisskey", "magnetar", "keybump", "dolphin", "calckey social", "azk.sns", "firefish", "qtmmsky", "iceshrimp", "owohub", "re＋", "russkey", "loverskey", "hajkey", "sharkey", "renekey", "renekey-lite", "yoiyami", "catnip"] or "shumihub" in software or "мисскей" in software or "milkey" in software or "misskey" in software:
         logger.debug("Setting misskey: software='%s'", software)
         software = "misskey"
     elif software in ["runtube.re", "islameye"]: