Continued:

- also include bookwyrm in instance discovering (blocks is WIP)

diff --git a/api.py b/api.py
index 37b990d8851a4eeca124f2396cf95cf153d8514a..2ac1ff9dc8bc069e0f4cb847513acdad9c7db0d2 100644 (file)
--- a/api.py
+++ b/api.py
@@ -14,7 +14,7 @@ templates = Jinja2Templates(directory=".")
 
 @app.get(fba.config["base_url"] + "/info")
 def info():
-    fba.cursor.execute("SELECT (SELECT COUNT(domain) FROM instances), (SELECT COUNT(domain) FROM instances WHERE software IN ('pleroma', 'mastodon', 'misskey', 'gotosocial', 'friendica')), (SELECT COUNT(blocker) FROM blocks)")
+    fba.cursor.execute("SELECT (SELECT COUNT(domain) FROM instances), (SELECT COUNT(domain) FROM instances WHERE software IN ('pleroma', 'mastodon', 'misskey', 'gotosocial', 'friendica', 'bookwyrm')), (SELECT COUNT(blocker) FROM blocks)")
     known, indexed, blocks = fba.cursor.fetchone()
 
     return {

diff --git a/fetch_blocks.py b/fetch_blocks.py
index 942068973527a4a47da5afad5d62b2041d4a9cfc..4bdf1580e8a0b618ff9eaf68c46323bde57fe9c6 100644 (file)
--- a/fetch_blocks.py
+++ b/fetch_blocks.py
@@ -6,7 +6,7 @@ import re
 import fba
 
 fba.cursor.execute(
-    "SELECT domain, software FROM instances WHERE software IN ('pleroma', 'mastodon', 'friendica', 'misskey', 'gotosocial') AND (last_blocked IS NULL OR last_blocked < ?) ORDER BY rowid DESC", [time.time() - fba.config["recheck_block"]]
+    "SELECT domain, software FROM instances WHERE software IN ('pleroma', 'mastodon', 'friendica', 'misskey', 'gotosocial', 'bookwyrm') AND (last_blocked IS NULL OR last_blocked < ?) ORDER BY rowid DESC", [time.time() - fba.config["recheck_block"]]
 )
 
 for blocker, software in fba.cursor.fetchall():

diff --git a/fetch_instances.py b/fetch_instances.py
index 0975ff4001ddc8f40586bf2c576586bc0fc55539..7ebebc6e5e93ab8185860f340fb5d07b7eed280a 100644 (file)
--- a/fetch_instances.py
+++ b/fetch_instances.py
@@ -55,7 +55,7 @@ fetch_instances(instance, None)
 
 # Loop through some instances
 fba.cursor.execute(
-    "SELECT domain FROM instances WHERE software IN ('pleroma', 'mastodon', 'friendica', 'misskey', 'gotosocial') AND (last_nodeinfo IS NULL OR last_nodeinfo < ?) ORDER BY rowid DESC", [time.time() - fba.config["recheck_instance"]]
+    "SELECT domain FROM instances WHERE software IN ('pleroma', 'mastodon', 'friendica', 'misskey', 'gotosocial', 'bookwyrm') AND (last_nodeinfo IS NULL OR last_nodeinfo < ?) ORDER BY rowid DESC", [time.time() - fba.config["recheck_instance"]]
 )
 
 for instance in fba.cursor.fetchall():