Continued:

- handle over proper severity level

diff --git a/fba/commands.py b/fba/commands.py
index e4ae2212c82bd3f5a6f14fa7f53af1a78f33a882..4f7e6881e939c55285871a8fc2ed0f3bb4074578 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -954,6 +954,9 @@ def fetch_oliphant(args: argparse.Namespace) -> int:
         },{
             "blocker": "union.place",
             "csv_url": "mastodon/union.place.csv",
+        },{
+            "blocker": "oliphant.social",
+            "csv_url": "mastodon/birdsite.csv",
         }
     )
 
@@ -968,9 +971,6 @@ def fetch_oliphant(args: argparse.Namespace) -> int:
         elif args.domain in domains:
             logger.debug("args.domain='%s' already handled - SKIPPED!", args.domain)
             continue
-        elif instances.is_recent(block["blocker"]):
-            logger.debug("block[blocker]='%s' has been recently crawled - SKIPPED!", block["blocker"])
-            continue
 
         # Fetch this URL
         logger.info("Fetching csv_url='%s' for blocker='%s' ...", block["csv_url"], block["blocker"])
@@ -1051,7 +1051,7 @@ def fetch_oliphant(args: argparse.Namespace) -> int:
             processed = utils.process_domain(domain, block["blocker"], inspect.currentframe().f_code.co_name)
             logger.debug("processed='%s'", processed)
 
-            if utils.process_block(block["blocker"], domain, None, "reject") and config.get("bot_enabled"):
+            if utils.process_block(block["blocker"], domain, None, severity) and config.get("bot_enabled"):
                 logger.debug("Appending blocked='%s',reason='%s' for blocker='%s' ...", domain, block["block_level"], block["blocker"])
                 blockdict.append({
                     "blocked": domain,