Continued:

[fba.git] / fetch_blocks.py

diff --git a/fetch_blocks.py b/fetch_blocks.py
index d8c33e099295ceacf4e70fa862300a1699bab13e..757685b40cc70ab563630bc4cf7ab1b7ba7a462d 100755 (executable)
--- a/fetch_blocks.py
+++ b/fetch_blocks.py
@@ -126,16 +126,7 @@ for blocker, software, origin, nodeinfo_url in rows:
                             # DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
                             fba.add_instance(blocked, blocker, sys.argv[0], nodeinfo_url)
 
-                        fba.cursor.execute(
-                            "SELECT * FROM blocks WHERE blocker = ? AND blocked = ? AND block_level = ? LIMIT 1",
-                            (
-                               blocker,
-                               blocked,
-                               block_level
-                           ),
-                        )
-
-                        if fba.cursor.fetchone() == None:
+                        if not fba.is_instance_blocked(blocker, blocked, block_level):
                             # DEBUG: print("DEBUG: Blocking:", blocker, blocked, block_level)
                             fba.block_instance(blocker, blocked, "unknown", block_level)
 
@@ -334,16 +325,7 @@ for blocker, software, origin, nodeinfo_url in rows:
                     blocking = blocked if blocked.count("*") <= 1 else blocked_hash
                     # DEBUG: print(f"DEBUG: blocking='{blocking}',blocked='{blocked}',blocked_hash='{blocked_hash}'")
 
-                    fba.cursor.execute(
-                        "SELECT * FROM blocks WHERE blocker = ? AND blocked = ? AND block_level = ? LIMIT 1",
-                        (
-                            blocker,
-                            blocking,
-                            block_level
-                        ),
-                    )
-
-                    if fba.cursor.fetchone() == None:
+                    if not fba.is_instance_blocked(blocker, blocked, block_level):
                         # DEBUG: print("DEBUG: Blocking:", blocker, blocked, block_level)
                         fba.block_instance(blocker, blocking, reason, block_level)
 
@@ -441,12 +423,7 @@ for blocker, software, origin, nodeinfo_url in rows:
                         # DEBUG: print("DEBUG: Hash wasn't found, adding:", blocked, blocker)
                         fba.add_instance(blocked, blocker, sys.argv[0], nodeinfo_url)
 
-                    fba.cursor.execute(
-                        "SELECT * FROM blocks WHERE blocker = ? AND blocked = ? AND block_level = ? LIMIT 1",
-                        (blocker, blocked, block_level),
-                    )
-
-                    if fba.cursor.fetchone() == None:
+                    if not fba.is_instance_blocked(blocker, blocked, block_level):
                         fba.block_instance(blocker, blocked, reason, block_level)
 
                         if block_level == "reject":
@@ -513,16 +490,7 @@ for blocker, software, origin, nodeinfo_url in rows:
                         # DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
                         fba.add_instance(blocked, blocker, sys.argv[0], nodeinfo_url)
 
-                    fba.cursor.execute(
-                        "SELECT * FROM blocks WHERE blocker = ? AND blocked = ? AND block_level = ? LIMIT 1",
-                        (
-                            blocker,
-                            blocked,
-                            "reject"
-                        ),
-                    )
-
-                    if fba.cursor.fetchone() == None:
+                    if not fba.is_instance_blocked(blocker, blocked, "reject"):
                         # DEBUG: print(f"DEBUG: blocker='{blocker}' is blocking '{blocked}' for unknown reason at this point")
                         fba.block_instance(blocker, blocked, "unknown", "reject")