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

Keep a bot-inhabited channel alive when pruning empty channels

Browse source
This commit is contained in:
Jean Chevronnet 2026-07-19 19:52:44 +00:00
parent 071380efae
commit 3c730f7add
No known key found for this signature in database
3 changed files with 45 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/engine/mod.rs
View file

@ -448,6 +448,7 @@ impl Engine {
// kick the channel's own bot). Any reconcile actions are returned.
fn member_left(&mut self, channel: &str, uid: &str) -> Vec<NetAction> {
self.network.channel_part(channel, uid);
self.prune_channel_if_gone(channel);
self.forget_chatter(channel, uid);
if let Some(bot_lc) = self.bot_uids.iter().find_map(|(lc, u)| (u == uid).then(|| lc.clone())) {
if self.bot_channels.remove(&(bot_lc, channel.to_string())) {
@ -738,12 +739,30 @@ 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) {
let chans = self.network.channels_of(uid);
self.network.user_quit(uid);
for c in &chans {
self.prune_channel_if_gone(c);
}
self.sasl_sessions.remove(uid);
self.pending_enforce.retain(|p| p.uid != uid);
self.forget_chatter_everywhere(uid);
}
// Forget a channel once it's truly gone on the ircd — no members AND no resident
// services bot (bots keep a channel alive without being tracked as members).
// Pruning it stops a stale key/mode leaking to a later channel of the same name,
// while keeping a botted/persistent channel's live state intact.
fn prune_channel_if_gone(&mut self, channel: &str) {
if self.network.channel_members(channel).next().is_some() {
return;
}
if self.bot_channels.iter().any(|(_, c)| c.eq_ignore_ascii_case(channel)) {
return;
}
self.network.remove_channel(channel);
}
// Log a single session out of `account`, telling them why (services-sourced).
fn logout_uid(&mut self, uid: &str, account: &str, reason: &str) {
if let Some(action) = self.feed("SESS", format!("{} logged out of \x02{account}\x02 ({reason})", self.who(uid))) {