Notation applied:

[fba.git] / fba / networks / misskey.py

diff --git a/fba/networks/misskey.py b/fba/networks/misskey.py
index 573b5252fcfdbc643731dc94e4d7ac8c87054850..e47c7dd9d04548c5d63171fec5dfb7665a83e69a 100644 (file)
--- a/fba/networks/misskey.py
+++ b/fba/networks/misskey.py
@@ -55,7 +55,7 @@ def fetch_peers(domain: str) -> list:
     # instances page-by-page, since that troonware doesn't support
     # sending them all at once
     while True:
-        logger.debug("Fetching offset='%d' from domain='%s' ...", offset, domain)
+        logger.debug("Fetching offset=%d from domain='%s' ...", offset, domain)
         if offset == 0:
             fetched = network.post_json_api(domain, "/api/federation/instances", json.dumps({
                 "sort" : "+pubAt",
@@ -91,13 +91,13 @@ def fetch_peers(domain: str) -> list:
             logger.debug("Fetched %d row(s) but expected: %d", len(rows), config.get('misskey_limit'))
             offset = offset + (config.get("misskey_limit") - len(rows))
         else:
-            logger.debug("Raising offset by step='%d'", step)
+            logger.debug("Raising offset by step=%d", step)
             offset = offset + step
 
         already = 0
         logger.debug("rows(%d))[]='%s'", len(rows), type(rows))
         for row in rows:
-            logger.debug(f"row()={len(row)}")
+            logger.debug("row()=%d", len(row))
             if "host" not in row:
                 logger.warning("row()=%d does not contain key 'host': row='%s',domain='%s' - SKIPPED!", len(row), row, domain)
                 continue
@@ -105,23 +105,20 @@ def fetch_peers(domain: str) -> list:
                 logger.warning("row[host][]='%s' is not 'str' - SKIPPED!", type(row['host']))
                 continue
             elif not utils.is_domain_wanted(row["host"]):
-                logger.debug("row[host]='%s' is not wanted, domain='{domain}' - SKIPPED!", row['host'])
+                logger.debug("row[host]='%s' is not wanted, domain='%s' - SKIPPED!", row['host'], domain)
                 continue
             elif row["host"] in peers:
                 logger.debug("Not adding row[host]='%s', already found - SKIPPED!", row['host'])
                 already = already + 1
                 continue
 
-            logger.debug("Adding peer: '%s'", row['host'])
+            logger.debug("Adding peer: row[host]='%s'", row['host'])
             peers.append(row["host"])
 
         if already == len(rows):
             logger.debug("Host returned same set of %d instance(s) - BREAK!", already)
             break
 
-    logger.debug("Adding %d for domain='%s'", len(peers), domain)
-    instances.set_total_peers(domain, peers)
-
     logger.debug("peers()=%d - EXIT!", len(peers))
     return peers
 
@@ -150,9 +147,9 @@ def fetch_blocks(domain: str) -> list:
     # instances page-by-page since it doesn't support sending them all at once
     while True:
         try:
-            logger.debug("Fetching offset='%d' from domain='%s' ...", offset, domain)
+            logger.debug("Fetching offset=%d from domain='%s' ...", offset, domain)
             if offset == 0:
-                logger.debug("Sending JSON API request to domain='%s',step='%d',offset='%d'", domain, step, offset)
+                logger.debug("Sending JSON API request to domain='%s',step=%d,offset=%d", domain, step, offset)
                 fetched = network.post_json_api(domain, "/api/federation/instances", json.dumps({
                     "sort"     : "+pubAt",
                     "host"     : None,
@@ -160,7 +157,7 @@ def fetch_blocks(domain: str) -> list:
                     "limit"    : step
                 }), headers)
             else:
-                logger.debug("Sending JSON API request to domain='%s',step='%d',offset='%d'", domain, step, offset)
+                logger.debug("Sending JSON API request to domain='%s',step=%d,offset=%d", domain, step, offset)
                 fetched = network.post_json_api(domain, "/api/federation/instances", json.dumps({
                     "sort"     : "+pubAt",
                     "host"     : None,
@@ -189,7 +186,7 @@ def fetch_blocks(domain: str) -> list:
                 logger.debug("Fetched %d row(s) but expected: %d", len(rows), config.get('misskey_limit'))
                 offset = offset + (config.get("misskey_limit") - len(rows))
             else:
-                logger.debug("Raising offset by step='%d'", step)
+                logger.debug("Raising offset by step=%d", step)
                 offset = offset + step
 
             count = 0
@@ -202,7 +199,7 @@ def fetch_blocks(domain: str) -> list:
                         "blocker"    : domain,
                         "blocked"    : tidyup.domain(instance["host"]),
                         "reason"     : None,
-                        "block_level": "suspend",
+                        "block_level": "suspended",
                     })
 
             logger.debug("count=%d", count)
@@ -220,7 +217,7 @@ def fetch_blocks(domain: str) -> list:
         # Fetch blocked (full suspended) instances
         try:
             if offset == 0:
-                logger.debug("Sending JSON API request to domain='%s',step='%d',offset='%d'", domain, step, offset)
+                logger.debug("Sending JSON API request to domain='%s',step=%d,offset=%d", domain, step, offset)
                 fetched = network.post_json_api(domain, "/api/federation/instances", json.dumps({
                     "sort"   : "+pubAt",
                     "host"   : None,
@@ -228,7 +225,7 @@ def fetch_blocks(domain: str) -> list:
                     "limit"  : step
                 }), headers)
             else:
-                logger.debug("Sending JSON API request to domain='%s',step='%d',offset='%d'", domain, step, offset)
+                logger.debug("Sending JSON API request to domain='%s',step=%d,offset=%d", domain, step, offset)
                 fetched = network.post_json_api(domain, "/api/federation/instances", json.dumps({
                     "sort"   : "+pubAt",
                     "host"   : None,
@@ -254,10 +251,10 @@ def fetch_blocks(domain: str) -> list:
                 logger.debug("Returned zero bytes, domain='%s' - BREAK!", domain)
                 break
             elif len(rows) != config.get("misskey_limit"):
-                logger.debug("Fetched %d row(s) but expected: '{config.get('misskey_limit')}'", len(rows))
+                logger.debug("Fetched %d row(s) but expected: %d'", len(rows), config.get('misskey_limit'))
                 offset = offset + (config.get("misskey_limit") - len(rows))
             else:
-                logger.debug("Raising offset by step='%d'", step)
+                logger.debug("Raising offset by step=%d", step)
                 offset = offset + step
 
             count = 0