Continued:

- nodeinfo_url should never be None/NULL here

diff --git a/fba/commands.py b/fba/commands.py
index e770b1c60942b67d9932aa93900efd42ce7e6f5f..179fbae83564e39c3173ffd0275220bc822451ff 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -298,7 +298,7 @@ def fetch_blocks(args: argparse.Namespace) -> int:
     elif args.only_none:
         # Check only entries with total_blocked=None
         database.cursor.execute(
-            "SELECT domain, software, origin, nodeinfo_url FROM instances WHERE software IN ('pleroma', 'mastodon', 'lemmy', 'friendica', 'misskey', 'piefed') AND total_blocks IS NULL ORDER BY last_blocked ASC, total_blocks DESC"
+            "SELECT domain, software, origin, nodeinfo_url FROM instances WHERE software IN ('pleroma', 'mastodon', 'lemmy', 'friendica', 'misskey', 'piefed') AND nodeinfo_url IS NOT NULL AND total_blocks IS NULL ORDER BY last_blocked ASC, total_blocks DESC"
         )
     else:
         # Re-check after "timeout" (aka. minimum interval)
@@ -315,7 +315,7 @@ def fetch_blocks(args: argparse.Namespace) -> int:
             logger.warning("blocker='%s' is not wanted - SKIPPED!", blocker)
             continue
         elif not args.force and instances.is_recent(blocker, "last_blocked"):
-            logger.debug("blocker='%s' has recently been accessed - SKIPPED!", blocker)
+            logger.debug("blocker='%s' has recently been crawled - SKIPPED!", blocker)
             continue
 
         logger.debug("Setting last_blocked,has_obfuscation=false for blocker='%s' ...", blocker)