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

refactor: WEBIRC gateways and +G censor rules are named structs (WebircGateway/CensorRule) instead of positional tuples — self-documenting field access, no (_, g, _) index guessing; extends the OperBlock pattern

Browse source
This commit is contained in:
Jean Chevronnet 2026-08-18 23:31:21 +00:00
parent c4456cf002
commit 235c747c03
4 changed files with 35 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/coremods/core_message.rs
View file

@ -105,16 +105,16 @@ fn ci_replace(hay: &str, find: &str, rep: &str) -> String {
/// +G censor: replace each configured bad word in `body`. Returns `None` when a
/// matched word has an empty replacement (⇒ the message must be blocked).
fn apply_censor(body: &str, censor: &[(String, String)]) -> Option<String> {
fn apply_censor(body: &str, censor: &[crate::config::CensorRule]) -> Option<String> {
let mut out = body.to_string();
for (find, replace) in censor {
if find.is_empty() || !ci_contains(&out, find) {
for rule in censor {
if rule.find.is_empty() || !ci_contains(&out, &rule.find) {
continue;
}
if replace.is_empty() {
if rule.replace.is_empty() {
return None; // no replacement ⇒ block
}
out = ci_replace(&out, find, replace);
out = ci_replace(&out, &rule.find, &rule.replace);
}
Some(out)
}

4
src/coremods/core_user.rs
View file

@ -102,8 +102,8 @@ impl Command for WebIrc {
let Some(gw) = s
.webirc
.iter()
.find(|(p, _, mask)| p == pass && (mask.is_empty() || glob_match(mask, &from)))
.map(|(_, g, _)| g.clone())
.find(|g| g.password == *pass && (g.ipmask.is_empty() || glob_match(&g.ipmask, &from)))
.map(|g| g.name.clone())
else {
s.notice_star(uid, "WEBIRC: invalid credentials");
return CmdResult::Fail;