From: Roland Häder <roland@mxchange.org>
Date: Mon, 12 Jun 2023 16:44:33 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=51e438dddfd730857695c95fdb89c7e10b66c342;p=fba.git

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

diff --git a/fba/blocks.py b/fba/blocks.py
index 528940b..d9ab70d 100644
--- 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 e38041c..6fe2422 100644
--- 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)