Continued:

- Takahe added (partly WIP)

diff --git a/api.py b/api.py
index 2ac1ff9dc8bc069e0f4cb847513acdad9c7db0d2..c0fc29d421be4d079a2ff17badcd9a131a3be8a4 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', 'bookwyrm')), (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', 'takahe')), (SELECT COUNT(blocker) FROM blocks)")
     known, indexed, blocks = fba.cursor.fetchone()
 
     return {

diff --git a/fetch_blocks.py b/fetch_blocks.py
index 0f75e156332e6937bf2653bff8aa97eba30dcd13..a0a302020e00e7b39f8cd71225c79cb5128d9579 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', 'bookwyrm') 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', 'takahe') 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():
@@ -271,7 +271,7 @@ for blocker, software in fba.cursor.fetchall():
             fba.connection.commit()
         except Exception as e:
             print("error:", e, blocker, software)
-    elif software == "friendica" or software == "misskey" or software == "bookwyrm":
+    elif software == "friendica" or software == "misskey" or software == "bookwyrm" or software == "takahe":
         print("INFO: blocker:", blocker)
         try:
             if software == "friendica":
@@ -280,6 +280,8 @@ for blocker, software in fba.cursor.fetchall():
                 json = fba.get_misskey_blocks(blocker)
             elif software == "bookwyrm":
                 json = fba.get_bookwyrm_blocks(blocker)
+            elif software == "takahe":
+                json = fba.get_takahe_blocks(blocker)
 
             for block_level, blocks in json.items():
                 # NOISY-DEBUG: print("DEBUG: blocker,block_level,blocks():", blocker, block_level, len(blocks))

diff --git a/fetch_instances.py b/fetch_instances.py
index 7ebebc6e5e93ab8185860f340fb5d07b7eed280a..0fb8a452a8c6e51622cf394cbf7c1c4fd6135a0b 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', 'bookwyrm') 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', 'takahe') AND (last_nodeinfo IS NULL OR last_nodeinfo < ?) ORDER BY rowid DESC", [time.time() - fba.config["recheck_instance"]]
 )
 
 for instance in fba.cursor.fetchall():