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

Don't expire runtime-granted opers; preserve standalone kicker flags across compaction
All checks were successful
CI / check (push) Successful in 4m12s
Details

Browse source
This commit is contained in:
Jean Chevronnet 2026-07-19 16:44:35 +00:00
parent b704ab2b50
commit d6b681c972
No known key found for this signature in database
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/engine/db/mod.rs
View file

@ -539,7 +539,7 @@ pub struct Trigger {
// BotServ's per-channel "kickers": the assigned bot kicks a message that trips // BotServ's per-channel "kickers": the assigned bot kicks a message that trips
// an enabled rule. Typed, like ChanSettings — a new kicker is one field. // an enabled rule. Typed, like ChanSettings — a new kicker is one field.
#[derive(Debug, Clone, Default, Serialize, Deserialize)] #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
pub struct KickerSettings { pub struct KickerSettings {
#[serde(default)] #[serde(default)]
pub caps: bool, pub caps: bool,
@ -1276,7 +1276,10 @@ impl Db {
if let Some(bot) = &c.assigned_bot { if let Some(bot) = &c.assigned_bot {
snapshot.push(Event::ChannelBotAssigned { channel: c.name.clone(), bot: bot.clone() }); snapshot.push(Event::ChannelBotAssigned { channel: c.name.clone(), bot: bot.clone() });
} }
if c.kickers.any() || c.kickers.dontkickops || c.kickers.ttb > 0 || c.kickers.ban_expire > 0 || c.kickers.votekick > 0 { // Snapshot whenever any kicker field differs from default, so standalone
// flags (warn, dontkickvoices) survive compaction too, not just the ones
// that force a kicker on.
if c.kickers != KickerSettings::default() {
snapshot.push(Event::ChannelKickerSet { channel: c.name.clone(), kickers: c.kickers.clone() }); snapshot.push(Event::ChannelKickerSet { channel: c.name.clone(), kickers: c.kickers.clone() });
} }
if !c.badwords.is_empty() { if !c.badwords.is_empty() {

6
src/engine/mod.rs
View file

@ -809,8 +809,10 @@ impl Engine {
} }
if let Some(ttl) = self.account_ttl { if let Some(ttl) = self.account_ttl {
for account in self.db.expired_accounts(now, ttl) { for account in self.db.expired_accounts(now, ttl) {
// Never expire an operator's account or one still in use. // Never expire an operator's account or one still in use. oper_privs
if self.opers.contains_key(&account.to_ascii_lowercase()) || !self.network.uids_logged_into(&account).is_empty() { // unions config [[oper]] AND runtime OperServ OPER grants — self.opers
// is config-only, so a runtime-granted oper was being dropped.
if self.oper_privs(&account).any() || !self.network.uids_logged_into(&account).is_empty() {
continue; continue;
} }
if self.db.drop_account(&account).unwrap_or(false) { if self.db.drop_account(&account).unwrap_or(false) {