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

xline: broadcast the XLINE notice on remove and expire too, so it covers every x-line's whole lifecycle

Browse source
This commit is contained in:
Jean Chevronnet 2026-08-21 15:03:36 +00:00
parent 6301b64509
commit 3ad67c6b52
No known key found for this signature in database
GPG key ID: 439666D63A9477E4
5 changed files with 69 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/coremods/core_oper.rs
View file

@ -726,20 +726,16 @@ fn do_xline(s: &mut Server, uid: Uid, params: &[String], kind: XKind) -> CmdResu
.map(|u| u.nick.clone())
.unwrap_or_default();
if params.len() < 2 {
let word = if s.remove_xline(kind, &mask) {
// A successful removal is announced by remove_xline (snomask +x), same as the
// add; only tell the oper directly when there was nothing to remove.
if s.remove_xline(kind, &mask, &nick) {
s.propagate_delline(kind.tag(), &mask);
"removed"
} else {
"not found"
};
s.send(
uid,
format!(
":{} NOTICE {nick} :{}-line {word}: {mask}",
s.name,
kind.tag()
),
);
s.send(
uid,
format!(":{} NOTICE {nick} :{}-line not found: {mask}", s.name, kind.tag()),
);
}
return CmdResult::Ok;
}
// <mask> <duration> :<reason>; tolerate the durationless form by taking an
@ -879,16 +875,14 @@ impl Command for Rline {
.map(|u| u.nick.clone())
.unwrap_or_default();
if params.len() < 2 {
let word = if s.remove_xline(XKind::Rline, &pattern) {
if s.remove_xline(XKind::Rline, &pattern, &nick) {
s.propagate_delline("R", &pattern);
"removed"
} else {
"not found"
};
s.send(
uid,
format!(":{} NOTICE {nick} :R-line {word}: {pattern}", s.name),
);
s.send(
uid,
format!(":{} NOTICE {nick} :R-line not found: {pattern}", s.name),
);
}
return CmdResult::Ok;
}
if let Err(e) = crate::regex::Regex::new(&pattern) {