From 8cf6ac6c4435fd2fad89a31093df3ef43849881d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 20 May 2023 13:12:05 +0200
Subject: [PATCH] Continued: - added last_blocked to reduce requering instances
 to often (be nice!)

---
 blocks_empty.db      | Bin 28672 -> 28672 bytes
 config.defaults.json |   3 ++-
 fba.py               |  13 +++++++++++++
 fetch_blocks.py      |   4 +++-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/blocks_empty.db b/blocks_empty.db
index af1c0a79e8d3719772c01d6a9f66b355ca7a0634..dc11b3532ecb5e55ac3b2fa97761b1c6d8cbd73e 100644
GIT binary patch
delta 113
zcmZp8z}WDBae}nqGX@3*b|_{9(lQfuj3u8j=y^}%<=0_g<uzvDYvz5&@5bBBYs^!=
zSy12x_vQee`%H{d6CK648qK-b#pUH0n`|ei@y`^~QOHRwE{RXd$xqHsO;Pal3vqRK
L4ch#lpD_Ud(E=SF

delta 90
zcmZp8z}WDBae}nqQw9bGb|_{9($W)kj3u8k=y^}%<=0_g<uzvDYvz5&AH&<tYs^!=
oSy12x_vQee`%H`m6B~878Wp+N#pUH0n*=8Z@Xy@*pPw-S0GZzv&Hw-a

diff --git a/config.defaults.json b/config.defaults.json
index 3578f7d..87f5b65 100644
--- a/config.defaults.json
+++ b/config.defaults.json
@@ -8,5 +8,6 @@
     "bot_token": "",
     "bot_visibility": "unlisted",
     "slogan": "### Your footer slogan ###",
-    "recheck_instance": 3600
+    "recheck_instance": 3600,
+    "recheck_block": 3600
 }
diff --git a/fba.py b/fba.py
index 53ef74c..78f6b8b 100644
--- a/fba.py
+++ b/fba.py
@@ -31,6 +31,19 @@ def get_hash(domain: str) -> str:
     # NOISY-DEBUG: print("DEBUG: Calculating hash for domain:", domain)
     return sha256(domain.encode("utf-8")).hexdigest()
 
+def update_last_blocked(domain: str):
+    # NOISY-DEBUG: print("DEBUG: Updating last_blocked for domain", domain)
+
+    try:
+        c.execute("UPDATE instances SET last_blocked = ? WHERE domain = ?", [
+            time.time(),
+            domain
+        ])
+
+    except:
+        print("ERROR: failed SQL query:", domain)
+        sys.exit(255)
+
 def update_last_error(domain: str, res: any):
     # NOISY-DEBUG: print("DEBUG: domain,res.status_code", domain, res.status_code)
 
diff --git a/fetch_blocks.py b/fetch_blocks.py
index 6984348..93b6134 100644
--- a/fetch_blocks.py
+++ b/fetch_blocks.py
@@ -6,7 +6,7 @@ import re
 import fba
 
 fba.c.execute(
-    "SELECT domain, software FROM instances WHERE software IN ('pleroma', 'mastodon', 'friendica', 'misskey', 'gotosocial') ORDER BY rowid DESC"
+    "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"]]
 )
 
 for blocker, software in fba.c.fetchall():
@@ -19,6 +19,8 @@ for blocker, software in fba.c.fetchall():
         print("WARNING: blocker is now empty!")
         continue
 
+    fba.update_last_blocked(blocker)
+
     if software == "pleroma":
         print("INFO: blocker:", blocker)
         try:
-- 
2.39.5