Continued:

- fixed instances.is_recent()
- blacklisted misskey-forkbomb.cf (the name says it)
- logger level changed to debug

diff --git a/fba/commands.py b/fba/commands.py
index c381f8d1befdf133091998af1c43aaf277011c9d..f153b565e9d59c7b2835d63f97d287825b7269ca 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -1270,7 +1270,7 @@ def fetch_joinmobilizon(args: argparse.Namespace) -> int:
         return 0
     else:
         logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain)
-        #sources.update(source_domain)
+        sources.update(source_domain)
 
     logger.info("Fetching instances from source_domain='%s' ...", source_domain)
     raw = utils.fetch_url(
@@ -1489,7 +1489,7 @@ def fetch_joinfediverse(args: argparse.Namespace) -> int:
             logger.debug("block[blocked]='%s' has been recently checked - SKIPPED!", block["blocked"])
             continue
 
-        logger.info("Proccessing blocked='%s' ...", block["blocked"])
+        logger.debug("Proccessing blocked='%s' ...", block["blocked"])
         processing.domain(block["blocked"], "climatejustice.social", inspect.currentframe().f_code.co_name)
 
     blockdict = list()

diff --git a/fba/helpers/blacklist.py b/fba/helpers/blacklist.py
index 02bd319150cb831e5d240f0b55ef6476d80c60fc..c96012ef58edfc7df997d51d532770a92be91548 100644 (file)
--- a/fba/helpers/blacklist.py
+++ b/fba/helpers/blacklist.py
@@ -20,11 +20,13 @@ from fba.helpers import domain as domain_helper
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
 
 # Don't check these, known trolls/flooders/testing/developing
 _blacklist = {
     "activitypub-troll.cf": "Floods federation with fake nodes as \"research\" project",
     "activitypub-proxy.cf": "Floods federation with fake nodes as \"research\" project",
+    "misskey-forkbomb.cf" : "Floods federation tables with fake nodes",
     "gab.best"            : "Floods federation tables with fake nodes",
     "4chan.icu"           : "Floods federation tables with fake nodes",
     "social.shrimpcam.pw" : "Floods federation tables with fake nodes",

diff --git a/fba/models/instances.py b/fba/models/instances.py
index c7db652c7736f682e62a4b1494b8b17764faec2b..f27d90e41e9946b4718b335b24324ce838c6eb19 100644 (file)
--- a/fba/models/instances.py
+++ b/fba/models/instances.py
@@ -37,6 +37,7 @@ from fba.models import error_log
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
 
 # Found info from node, such as nodeinfo URL, detection mode that needs to be
 # written to database. Both arrays must be filled at the same time or else
@@ -314,10 +315,11 @@ def is_recent(domain: str, column: str = "last_instance_fetch") -> bool:
     database.cursor.execute(f"SELECT {column} FROM instances WHERE domain = ? LIMIT 1", [domain])
 
     # Fetch row
-    fetched = database.cursor.fetchone()[column]
+    fetched = float(database.cursor.fetchone()[column])
+    diff = (time.time() - fetched)
 
-    logger.debug("fetched[%s]='%s',key='%s'", type(fetched), fetched, key)
-    recently = isinstance(fetched, float) and (time.time() - fetched) >= config.get(key)
+    logger.debug("fetched[%s]='%s',key='%s',diff=%f", type(fetched), fetched, key, diff)
+    recently = bool(diff < config.get(key))
 
     logger.debug("recently='%s' - EXIT!", recently)
     return recently

diff --git a/fba/utils.py b/fba/utils.py
index d1cf021fe3781e65d154215f49352fdd34d43274..ee2376bebcf13e2963c4ac5aed8f70d3c322951d 100644 (file)
--- a/fba/utils.py
+++ b/fba/utils.py
@@ -120,19 +120,19 @@ def is_domain_wanted(domain: str) -> bool:
     elif domain.lower() != domain:
         wanted = False
     elif not validators.domain(domain.split("/")[0]):
-        logger.debug("domain='%s' is not a valid domain name - settings False ...", domain)
+        logger.debug("domain='%s' is not a valid domain name - setting False ...", domain)
         wanted = False
     elif domain.endswith(".arpa"):
-        logger.debug("domain='%s' is a domain for reversed IP addresses - settings False ...", domain)
+        logger.debug("domain='%s' is a domain for reversed IP addresses - setting False ...", domain)
         wanted = False
     elif domain.endswith(".onion"):
-        logger.debug("domain='%s' is a TOR .onion domain - settings False ...", domain)
+        logger.debug("domain='%s' is a TOR .onion domain - setting False ...", domain)
         wanted = False
     elif domain.endswith(".tld"):
-        logger.debug("domain='%s' is a fake domain - settings False ...", domain)
+        logger.debug("domain='%s' is a fake domain - setting False ...", domain)
         wanted = False
     elif blacklist.is_blacklisted(domain):
-        logger.debug("domain='%s' is blacklisted - settings False ...", domain)
+        logger.debug("domain='%s' is blacklisted - setting False ...", domain)
         wanted = False
     elif domain.find("/profile/") > 0 or domain.find("/users/") > 0 or (instances.is_registered(domain.split("/")[0]) and domain.find("/c/") > 0):
         logger.debug("domain='%s' is a single user", domain)