Continued:

- blocked 'documentation.on.seirdy.one'
- removed old-lost blocklists
- added another CSV file for seirdy.one

diff --git a/fba/helpers/blacklist.py b/fba/helpers/blacklist.py
index b051febf53b6bd98802859a318fb82958f482a6f..321fe3fb270295696ab2b8d36b7b0127e419a4ae 100644 (file)
--- a/fba/helpers/blacklist.py
+++ b/fba/helpers/blacklist.py
@@ -75,6 +75,7 @@ _blacklist = {
     "clients.your-server.de"         : "Please get yourself a proper domain name, no static-IP host names",
     "reverse.open-telekom-cloud.com" : "Please get yourself a proper domain name, no static-IP host names",
     "static.sl-reverse.messenger.com": "Please get yourself a proper domain name, no static-IP host names",
+    "documentation.on.seirdy.one"    : "Just ignore such lines!",
 }
 
 @lru_cache

diff --git a/fba/helpers/blocklists.py b/fba/helpers/blocklists.py
index 934fa8cbd6ccfeaa9761af8ebf6be22d1f4fd6b0..1f869d80d61e16a9b56dc2529d15b10cf8bbee31 100644 (file)
--- a/fba/helpers/blocklists.py
+++ b/fba/helpers/blocklists.py
@@ -26,24 +26,6 @@ logger = logging.getLogger(__name__)
 # Blocklists hosted by oliphant
 oliphant_blocklists = (
     {
-        "blocker": "artisan.chat",
-        "csv_url": "mastodon/artisan.chat.csv",
-    },{
-        "blocker": "colorid.es",
-        "csv_url": "mastodon/colorid.es.csv",
-    },{
-        "blocker": "indiepocalypse.social",
-        "csv_url": "mastodon/indiepocalypse.social.csv",
-    },{
-        "blocker": "mastodon.art",
-        "csv_url": "mastodon/mastodon.art.csv",
-    },{
-        "blocker": "pleroma.envs.net",
-        "csv_url": "mastodon/pleroma.envs.net.csv",
-    },{
-        "blocker": "oliphant.social",
-        "csv_url": "mastodon/_unified_tier3_blocklist.csv",
-    },{
         "blocker": "mastodon.online",
         "csv_url": "mastodon/mastodon.online.csv",
     },{
@@ -53,20 +35,8 @@ oliphant_blocklists = (
         "blocker": "mastodon.social",
         "csv_url": "other/missing-tier0-mastodon.social.csv",
     },{
-        "blocker": "rage.love",
-        "csv_url": "mastodon/rage.love.csv",
-    },{
-        "blocker": "sunny.garden",
-        "csv_url": "mastodon/sunny.garden.csv",
-    },{
-        "blocker": "sunny.garden",
-        "csv_url": "mastodon/gardenfence.csv",
-    },{
-        "blocker": "toot.wales",
-        "csv_url": "mastodon/toot.wales.csv",
-    },{
-        "blocker": "oliphant.social",
-        "csv_url": "mastodon/birdsite.csv",
+        "blocker": "seirdy.one",
+        "csv_url": "mastodon/seirdy-tier0.csv",
     },
 )