Bound dice batches, game count, and report/help queues, and harden community votekick

modules/diceserv/src/expr.rs

@@ -9,7 +9,7 @@ use rand::Rng;
 // Guardrails so a single expression can't ask us to roll forever.
 const MAX_DICE: u64 = 99_999; // dice in one NdM roll
 const MAX_SIDES: u64 = 99_999; // sides on a die
-const MAX_TOTAL: u64 = 1_000_000; // dice rolled across the whole expression
+pub const MAX_TOTAL: u64 = 1_000_000; // dice rolled across the whole expression
 
 // One resolved dice roll, kept for the extended (EX) output.
 pub struct Roll {
@@ -21,6 +21,7 @@ pub struct Roll {
 pub struct Evaluated {
     pub value: f64,
     pub rolls: Vec<Roll>,
+    pub total: u64, // dice rolled in this evaluation, for cross-repeat budgeting
 }
 
 // ---- tokens ----------------------------------------------------------------
@@ -230,7 +231,7 @@ pub fn evaluate(input: &str, rng: &mut impl Rng) -> Result<Evaluated, String> {
     if !value.is_finite() {
         return Err("that doesn't come out to a real number".to_string());
     }
-    Ok(Evaluated { value, rolls })
+    Ok(Evaluated { value, rolls, total: total_dice })
 }
 
 fn eval(ast: &Ast, rng: &mut impl Rng, rolls: &mut Vec<Roll>, total: &mut u64) -> Result<f64, String> {

modules/diceserv/src/roll.rs

@@ -27,9 +27,11 @@ pub fn handle(me: &str, from: &Sender, rest: &[&str], ctx: &mut ServiceCtx, exte
     };
 
     let mut rng = rand::thread_rng();
+    let mut spent = 0u64; // dice rolled across the whole repeat batch
     for i in 0..times {
         match expr::evaluate(body, &mut rng) {
             Ok(ev) => {
+                spent += ev.total;
                 let result = format_value(ev.value, round_result);
                 let prefix = if times > 1 { format!("[{}/{}] ", i + 1, times) } else { String::new() };
                 let detail = if extended && !ev.rolls.is_empty() {
@@ -38,6 +40,14 @@ pub fn handle(me: &str, from: &Sender, rest: &[&str], ctx: &mut ServiceCtx, exte
                     String::new()
                 };
                 ctx.notice(me, from.uid, format!("{prefix}\x02{body}\x02 = \x02{result}\x02{detail}"));
+                // Bound total work across the whole `N~` batch, not per-evaluate, so
+                // `25~99999d1+…` can't multiply the per-roll cap into tens of millions.
+                if spent >= expr::MAX_TOTAL {
+                    if i + 1 < times {
+                        ctx.notice(me, from.uid, "That's a lot of dice — stopping the repeats here.");
+                    }
+                    break;
+                }
             }
             Err(why) => {
                 ctx.notice(me, from.uid, format!("I couldn't roll \x02{body}\x02: {why}."));