fedserv/echo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

operserv: notify_exclude also mutes #channel masks, so a broad watch can skip specific channels
Some checks failed
CI / check (push) Has been cancelled
Details

Browse source
This commit is contained in:
Jean Chevronnet 2026-07-18 17:19:48 +00:00
parent bbdb34aa77
commit 29bedf0358
No known key found for this signature in database
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/engine/db/network.rs
View file

@ -187,14 +187,18 @@ impl Db {
/// channel: a `#`/`&` mask tests the channel name, any other tests the user's
/// identity. The engine tests the result for a given event's letter.
pub fn notify_flags(&self, target: Option<&echo_api::BanTarget>, chan: Option<&str>) -> String {
// A user on the exclude list (e.g. a `*/*` PyLink relay client) is never
// matched, so relayed traffic can't flood the staff feed.
if let Some(t) = target {
if self.notify_exclude.iter().any(|m| {
echo_api::akick_matches(m, t) || (!m.contains(['@', '!']) && glob_match(m, t.nick))
}) {
return String::new();
// Exclusions come first, same mask grammar as a watch: a `#channel` mask
// mutes events in that channel, any other mask mutes a user (e.g. `*/*` for
// PyLink relay clients). A match means the event never reaches the feed.
let excluded = self.notify_exclude.iter().any(|m| {
if m.starts_with('#') || m.starts_with('&') {
chan.is_some_and(|c| glob_match(m, c))
} else {
target.is_some_and(|t| echo_api::akick_matches(m, t) || (!m.contains(['@', '!']) && glob_match(m, t.nick)))
}
});
if excluded {
return String::new();
}
let now = now();
let mut flags = String::new();