From 38e9a151bcf2ef953bc85643a66d746628beacda Mon Sep 17 00:00:00 2001 From: eddy Date: Sat, 5 Sep 2026 17:32:13 +0200 Subject: [PATCH] v1.2.0: filter uitgebreid voor betere ov-recall - vervoerders: ns, arriva, qbuzz, syntus, breng, u-ov, allgo, flixbus, blauwnet, r-net, valleilijn, waterbus, eurostar, thalys, randstadrail - samenstellingen: bus/tram/metro + halte(s)/lijn(en)/station(s)/verkeer/net (ving 'tramhaltes lijn 26' dat voorheen mistte) - trein-uitbreiding: reizigers/station - infrastructuur: spoorweg/-baan/-lijn/-verkeer/-wegovergang/-storing, perron(s), overweg(en), sein(storing), wisselstoring, ontsporing - concepten: dienstregeling, reizigers, inchecken/uitchecken, pont(en), lightrail, pendelbus/shuttlebus - getest op 1445 historische entries: 25 matches (was 22), 2 vals-positieven verwijderd (havenstaking, zwemwater), tramhaltes-gap gedicht --- base-config.yaml | 2 +- buzzrss/bot.py | 10 +++++++--- maubot.yaml | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/base-config.yaml b/base-config.yaml index ca97d31..94b6fe7 100644 --- a/base-config.yaml +++ b/base-config.yaml @@ -18,7 +18,7 @@ allow_filter: false # Global match filter (whitelist): applies to ALL feeds in this instance. # A post is ONLY sent when the regex matches the title OR the (HTML-stripped) summary. # Set it live with `!rss set-filter `. Empty = send everything. -match_filter: "(?i)\\b(?:gvb|ebs|connexxion|cxx|transdev|keolis|ret|gvu|bus|metro|tram|ov)\\b|trein(?:en|verkeer|stel(?:len)?|staking|ongeluk)?|\\bov-staking|staking" +match_filter: "(?i)\\b(?:ns|arriva|qbuzz|connexxion|cxx|transdev|keolis|ret|gvb|ebs|htm|syntus|breng|u-ov|allgo|flixbus|blauwnet|r-net|valleilijn|waterbus|eurostar|thalys|randstadrail|gvu|ov)\\b|\\b(?:bus|tram|metro)(?:halte|haltes|lijn|lijnen|station|stations|verkeer|net)?\\b|\\btrein(?:en|verkeer|stel(?:len)?|staking|ongeluk|reizigers?|station|stations)?\\b|\\b(?:spoorweg|spoorbaan|spoorlijn|spoorverkeer|spoorwegovergang|spoorstoring|perron|perrons|overweg|overwegen|seinstoring|wisselstoring|sein|ontsporing|ontspoord)\\b|\\b(?:dienstregeling|reizigers?|inchecken|uitchecken|pont|ponten|lightrail|pendelbus|shuttlebus)\\b|\\b(?:ov-staking|staking|stakingen)\\b" # Users who can bypass room permission checks admins: - "@user:example.com" diff --git a/buzzrss/bot.py b/buzzrss/bot.py index c3eda54..83846ae 100644 --- a/buzzrss/bot.py +++ b/buzzrss/bot.py @@ -49,9 +49,13 @@ rss_change_level = EventType.find("xyz.maubot.rss", t_class=EventType.Class.STAT DEFAULT_MATCH_FILTER = ( - r"(?i)\b(?:gvb|ebs|connexxion|cxx|transdev|keolis|ret|gvu|bus|metro|tram|ov)\b" - r"|trein(?:en|verkeer|stel(?:len)?|staking|ongeluk)?" - r"|\bov-staking|staking" + r"(?i)" + r"\b(?:ns|arriva|qbuzz|connexxion|cxx|transdev|keolis|ret|gvb|ebs|htm|syntus|breng|u-ov|allgo|flixbus|blauwnet|r-net|valleilijn|waterbus|eurostar|thalys|randstadrail|gvu|ov)\b" + r"|\b(?:bus|tram|metro)(?:halte|haltes|lijn|lijnen|station|stations|verkeer|net)?\b" + r"|\btrein(?:en|verkeer|stel(?:len)?|staking|ongeluk|reizigers?|station|stations)?\b" + r"|\b(?:spoorweg|spoorbaan|spoorlijn|spoorverkeer|spoorwegovergang|spoorstoring|perron|perrons|overweg|overwegen|seinstoring|wisselstoring|sein|ontsporing|ontspoord)\b" + r"|\b(?:dienstregeling|reizigers?|inchecken|uitchecken|pont|ponten|lightrail|pendelbus|shuttlebus)\b" + r"|\b(?:ov-staking|staking|stakingen)\b" ) diff --git a/maubot.yaml b/maubot.yaml index a7b96d4..85a6648 100644 --- a/maubot.yaml +++ b/maubot.yaml @@ -1,5 +1,5 @@ id: nl.eddydevink.rss -version: 1.1.2 +version: 1.2.0 modules: - buzzrss main_class: RSSBot