Continued:

- added alias 'rosekey' for 'misskey'
- also 'smithereen' is a federating (at least peer list is provided) software

diff --git a/daemon.py b/daemon.py
index 695ab0442b1639c6e0fdb64e7b1290b51577ab59..0cfff1a3e99199f2bc580353fdfd2b4ab2bc865a 100755 (executable)
--- a/daemon.py
+++ b/daemon.py
@@ -56,7 +56,7 @@ templates = Jinja2Templates(directory="templates")
 
 @router.get(config.get("base_url") + "/api/info.json", response_class=JSONResponse)
 def api_info():
-    database.cursor.execute("SELECT (SELECT COUNT(domain) FROM instances), (SELECT COUNT(domain) FROM instances WHERE software IN ('pleroma', 'mastodon', 'lemmy', 'friendica', 'misskey', 'peertube', 'takahe', 'gotosocial', 'brighteon', 'wildebeest', 'bookwyrm', 'mitra', 'areionskey', 'mammuthus', 'neodb')), (SELECT COUNT(blocker) FROM blocks), (SELECT COUNT(domain) FROM instances WHERE last_error_details IS NOT NULL)")
+    database.cursor.execute("SELECT (SELECT COUNT(domain) FROM instances), (SELECT COUNT(domain) FROM instances WHERE software IN ('pleroma', 'mastodon', 'lemmy', 'friendica', 'misskey', 'peertube', 'takahe', 'gotosocial', 'brighteon', 'wildebeest', 'bookwyrm', 'mitra', 'areionskey', 'mammuthus', 'neodb', 'smithereen')), (SELECT COUNT(blocker) FROM blocks), (SELECT COUNT(domain) FROM instances WHERE last_error_details IS NOT NULL)")
     row = database.cursor.fetchone()
 
     return JSONResponse(status_code=200, content={

diff --git a/fba/commands.py b/fba/commands.py
index cb612ba76e4adff11aa5a6475579872d1749904b..561815c97ca4d75404cc7483f964880a375ba269 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -1007,7 +1007,7 @@ def fetch_instances(args: argparse.Namespace) -> int:
     database.cursor.execute(
         "SELECT domain, origin, software \
 FROM instances \
-WHERE software IN ('pleroma', 'mastodon', 'friendica', 'misskey', 'lemmy', 'peertube', 'takahe', 'gotosocial', 'brighteon', 'wildebeest', 'bookwyrm', 'mitra', 'areionskey', 'mammuthus', 'neodb') \
+WHERE software IN ('pleroma', 'mastodon', 'friendica', 'misskey', 'lemmy', 'peertube', 'takahe', 'gotosocial', 'brighteon', 'wildebeest', 'bookwyrm', 'mitra', 'areionskey', 'mammuthus', 'neodb', 'smithereen') \
 AND (last_instance_fetch IS NULL OR last_instance_fetch < ?) \
 ORDER BY total_peers DESC, last_response_time ASC, last_updated ASC", [time.time() - config.get("recheck_instance")]
     )

diff --git a/fba/helpers/software.py b/fba/helpers/software.py
index b68f4ed3e76e02ae4f58b1033058bd185759f97e..4a78ab3d61eab7142a1e97afe0ea578c50fed2cc 100644 (file)
--- a/fba/helpers/software.py
+++ b/fba/helpers/software.py
@@ -62,7 +62,8 @@ _misskey_aliases = [
     "lycheebridge",
     "goblin",
     "miraiskey",
-    "lovers"
+    "lovers",
+    "rosekey"
 ]
 
 @lru_cache