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

engine: handle inbound KILL — forget users, reintroduce bots

Browse source 
KILL was never parsed, so a killed user lingered in services' state (stale
session, session-limit slot, channel membership) and a killed services bot
vanished for good. The parser now surfaces UserKilled; a killed real user is
forgotten like a QUIT (shared forget_user helper), while a killed bot is
dropped and reconciled so it is reintroduced and rejoins its channels.
This commit is contained in:
Jean Chevronnet 2026-07-16 10:06:36 +00:00
parent a9a3408de0
commit 63ecd79b12
No known key found for this signature in database
4 changed files with 84 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/engine/mod.rs
View file

@ -533,6 +533,15 @@ impl Engine {
}
}
// Forget a user who left the network (QUIT or KILL): drop their membership,
// any half-finished SASL exchange, and their pending nick-protection timer.
fn forget_user(&mut self, uid: &str) {
self.network.user_quit(uid);
self.sasl_sessions.remove(uid);
self.pending_enforce.retain(|p| p.uid != uid);
self.forget_chatter_everywhere(uid);
}
// Log a single session out of `account`, telling them why (services-sourced).
fn logout_uid(&mut self, uid: &str, account: &str, reason: &str) {
self.network.clear_account(uid);
@ -1031,10 +1040,21 @@ impl Engine {
}
}
NetEvent::Quit { uid } => {
self.network.user_quit(&uid);
self.sasl_sessions.remove(&uid); // drop any half-finished exchange
self.pending_enforce.retain(|p| p.uid != uid);
self.forget_chatter_everywhere(&uid);
self.forget_user(&uid);
Vec::new()
}
NetEvent::UserKilled { uid } => {
// If the ircd killed one of our bots, forget it so reconcile
// reintroduces it (and rejoins its channels); a killed real user is
// simply gone.
if let Some(bot_lc) = self.bot_uids.iter().find_map(|(lc, u)| (u == &uid).then(|| lc.clone())) {
self.bot_uids.remove(&bot_lc);
self.bot_idents.remove(&bot_lc);
self.network.bot_forget(&bot_lc);
self.bot_channels.retain(|(b, _)| *b != bot_lc);
return self.reconcile_bots();
}
self.forget_user(&uid);
Vec::new()
}
NetEvent::Privmsg { from, to, text } => self.dispatch(&from, &to, &text),