Continued:

- no more 'unknown' blocking reasons, just keep them empty

diff --git a/fba/blocks.py b/fba/blocks.py
index 528940b4d3a104412811f0e3f01b1b78b2a9462b..d9ab70d62b649db51a93810fa7cc338df5dbba55 100644 (file)
--- a/fba/blocks.py
+++ b/fba/blocks.py
@@ -42,7 +42,7 @@ def update_reason(reason: str, blocker: str, blocked: str, block_level: str):
     # DEBUG: print("DEBUG: Updating block reason:", reason, blocker, blocked, block_level)
     try:
         fba.cursor.execute(
-            "UPDATE blocks SET reason = ?, last_seen = ? WHERE blocker = ? AND blocked = ? AND block_level = ? AND (reason IS NULL OR reason IN ('','unknown')) LIMIT 1",
+            "UPDATE blocks SET reason = ?, last_seen = ? WHERE blocker = ? AND blocked = ? AND block_level = ? AND (reason IS NULL OR reason = '') LIMIT 1",
             (
                 reason,
                 time.time(),

diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index e38041cc1333265ae4b04fa73213b5bded8ba316..6fe2422c3a376f8895ea22433f6ee96550673e90 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -140,7 +140,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
                     if not blocks.is_instance_blocked(domain, blocked, block_level):
                         # DEBUG: print("DEBUG: Blocking:", domain, blocked, block_level)
-                        blocks.add_instance(domain, blocked, "unknown", block_level)
+                        blocks.add_instance(domain, blocked, None, block_level)
 
                         if block_level == "reject":
                             # DEBUG: print("DEBUG: Adding to blockdict:", blocked)
@@ -209,7 +209,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
             if not blocks.is_instance_blocked(domain, blocked, block_level):
                 # DEBUG: print("DEBUG: Blocking:", domain, blocked, block_level)
-                blocks.add_instance(domain, blocked, "unknown", block_level)
+                blocks.add_instance(domain, blocked, None, block_level)
 
                 if block_level == "reject":
                     # DEBUG: print("DEBUG: Adding to blockdict:", blocked)