Continued:

[fba.git] / fetch_blocks.py

diff --git a/fetch_blocks.py b/fetch_blocks.py
index 757685b40cc70ab563630bc4cf7ab1b7ba7a462d..a9b8535305b2a2899a0f7da768569b13a31cc376 100755 (executable)
--- a/fetch_blocks.py
+++ b/fetch_blocks.py
@@ -37,7 +37,7 @@ print(f"INFO: Checking {len(rows)} entries ...")
 for blocker, software, origin, nodeinfo_url in rows:
     # DEBUG: print("DEBUG: BEFORE blocker,software,origin,nodeinfo_url:", blocker, software, origin, nodeinfo_url)
     blockdict = []
-    blocker = fba.tidyup(blocker)
+    blocker = fba.tidyup_domain(blocker)
     # DEBUG: print("DEBUG: AFTER blocker,software:", blocker, software)
 
     if blocker == "":
@@ -80,7 +80,7 @@ for blocker, software, origin, nodeinfo_url in rows:
                     **{"quarantined_instances": federation["quarantined_instances"]}}
                 ).items():
                     # DEBUG: print("DEBUG: block_level, blocks():", block_level, len(blocks))
-                    block_level = fba.tidyup(block_level)
+                    block_level = fba.tidyup_domain(block_level)
                     # DEBUG: print("DEBUG: BEFORE block_level:", block_level)
 
                     if block_level == "":
@@ -90,11 +90,11 @@ for blocker, software, origin, nodeinfo_url in rows:
                     # DEBUG: print(f"DEBUG: Checking {len(blocks)} entries from blocker='{blocker}',software='{software}',block_level='{block_level}' ...")
                     for blocked in blocks:
                         # DEBUG: print("DEBUG: BEFORE blocked:", blocked)
-                        blocked = fba.tidyup(blocked)
+                        blocked = fba.tidyup_domain(blocked)
                         # DEBUG: print("DEBUG: AFTER blocked:", blocked)
 
                         if blocked == "":
-                            print("WARNING: blocked is empty after fba.tidyup():", blocker, block_level)
+                            print("WARNING: blocked is empty after fba.tidyup_domain():", blocker, block_level)
                             continue
                         elif fba.is_blacklisted(blocked):
                             # DEBUG: print(f"DEBUG: blocked='{blocked}' is blacklisted - skipping!")
@@ -153,7 +153,7 @@ for blocker, software, origin, nodeinfo_url in rows:
                     else {})}
                 ).items():
                     # DEBUG: print("DEBUG: block_level, info.items():", block_level, len(info.items()))
-                    block_level = fba.tidyup(block_level)
+                    block_level = fba.tidyup_domain(block_level)
                     # DEBUG: print("DEBUG: BEFORE block_level:", block_level)
 
                     if block_level == "":
@@ -163,11 +163,11 @@ for blocker, software, origin, nodeinfo_url in rows:
                     # DEBUG: print(f"DEBUG: Checking {len(info.items())} entries from blocker='{blocker}',software='{software}',block_level='{block_level}' ...")
                     for blocked, reason in info.items():
                         # DEBUG: print("DEBUG: BEFORE blocked:", blocked)
-                        blocked = fba.tidyup(blocked)
+                        blocked = fba.tidyup_domain(blocked)
                         # DEBUG: print("DEBUG: AFTER blocked:", blocked)
 
                         if blocked == "":
-                            print("WARNING: blocked is empty after fba.tidyup():", blocker, block_level)
+                            print("WARNING: blocked is empty after fba.tidyup_domain():", blocker, block_level)
                             continue
                         elif fba.is_blacklisted(blocked):
                             # DEBUG: print(f"DEBUG: blocked='{blocked}' is blacklisted - skipping!")
@@ -268,7 +268,7 @@ for blocker, software, origin, nodeinfo_url in rows:
             print(f"INFO: Checking {len(json.items())} entries from blocker='{blocker}',software='{software}' ...")
             for block_level, blocks in json.items():
                 # DEBUG: print("DEBUG: blocker,block_level,blocks():", blocker, block_level, len(blocks))
-                block_level = fba.tidyup(block_level)
+                block_level = fba.tidyup_domain(block_level)
                 # DEBUG: print("DEBUG: AFTER-block_level:", block_level)
                 if block_level == "":
                     print("WARNING: block_level is empty, blocker:", blocker)
@@ -278,7 +278,7 @@ for blocker, software, origin, nodeinfo_url in rows:
                 for block in blocks:
                     blocked, blocked_hash, reason = block.values()
                     # DEBUG: print("DEBUG: blocked,hash,reason:", blocked, blocked_hash, reason)
-                    blocked = fba.tidyup(blocked)
+                    blocked = fba.tidyup_domain(blocked)
                     # DEBUG: print("DEBUG: AFTER-blocked:", blocked)
 
                     if blocked == "":
@@ -362,7 +362,7 @@ for blocker, software, origin, nodeinfo_url in rows:
             print(f"INFO: Checking {len(json.items())} entries from blocker='{blocker}',software='{software}' ...")
             for block_level, blocks in json.items():
                 # DEBUG: print("DEBUG: blocker,block_level,blocks():", blocker, block_level, len(blocks))
-                block_level = fba.tidyup(block_level)
+                block_level = fba.tidyup_domain(block_level)
                 # DEBUG: print("DEBUG: AFTER-block_level:", block_level)
                 if block_level == "":
                     print("WARNING: block_level is empty, blocker:", blocker)
@@ -372,7 +372,7 @@ for blocker, software, origin, nodeinfo_url in rows:
                 for block in blocks:
                     blocked, reason = block.values()
                     # DEBUG: print("DEBUG: BEFORE blocked:", blocked)
-                    blocked = fba.tidyup(blocked)
+                    blocked = fba.tidyup_domain(blocked)
                     # DEBUG: print("DEBUG: AFTER blocked:", blocked)
 
                     if blocked == "":
@@ -455,7 +455,7 @@ for blocker, software, origin, nodeinfo_url in rows:
                 for peer in federation:
                     blocked = peer["domain"].lower()
                     # DEBUG: print("DEBUG: BEFORE blocked:", blocked)
-                    blocked = fba.tidyup(blocked)
+                    blocked = fba.tidyup_domain(blocked)
                     # DEBUG: print("DEBUG: AFTER blocked:", blocked)
 
                     if blocked == "":