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

xline: show a timed ban's remaining time in the removal notice

Browse source
This commit is contained in:
Jean Chevronnet 2026-08-21 15:10:27 +00:00
parent 3ad67c6b52
commit 745ddd540e
No known key found for this signature in database
GPG key ID: 439666D63A9477E4
2 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/server.rs
View file

@ -1629,12 +1629,15 @@ mod tests {
u.flags.snomask = true;
u.flags.snomask_cats = "x".to_string();
}
// permanent G-line, then removed
// permanent G-line, then removed → "permanent", no remaining clause
s.add_xline(crate::xline::XKind::Gline, "*@bad.example", 0, "op", "spam");
assert!(s.remove_xline(crate::xline::XKind::Gline, "*@bad.example", "op"));
assert!(!s.remove_xline(crate::xline::XKind::Gline, "*@bad.example", "op")); // gone: no re-announce
// timed K-line removed early → reports the time it had left
s.add_xline(crate::xline::XKind::Kline, "*@foo.example", 604800, "op", "temp");
assert!(s.remove_xline(crate::xline::XKind::Kline, "*@foo.example", "op"));
// a timed Z-line whose expiry is forced into the past, then purged
s.add_xline(crate::xline::XKind::Zline, "192.0.2.5", 3600, "op", "temp");
s.add_xline(crate::xline::XKind::Zline, "192.0.2.5", 3600, "op", "temp2");
for x in s.xlines.iter_mut() {
if x.mask == "192.0.2.5" {
x.expires = 1;
@ -1644,7 +1647,11 @@ mod tests {
let joined: String =
std::iter::from_fn(|| orx.try_recv().ok()).collect::<Vec<_>>().join("\n");
assert!(joined.contains("XLINE: op added a permanent G-line on *@bad.example: spam"), "add: {joined}");
assert!(joined.contains("XLINE: op removed a G-line on *@bad.example"), "remove: {joined}");
assert!(joined.contains("XLINE: op removed a permanent G-line on *@bad.example"), "remove permanent: {joined}");
assert!(
joined.contains("XLINE: op removed a timed K-line on *@foo.example (") && joined.contains("remaining)"),
"remove timed shows remaining: {joined}"
);
assert!(joined.contains("XLINE: Z-line on 192.0.2.5 expired"), "expire: {joined}");
}