forked from projectmoon/tenebrous-dicebot
Consolidate dice module into logic module.
This commit is contained in:
parent
402f236ba7
commit
3d5cda39c8
|
@ -308,7 +308,7 @@ pub async fn roll_pool(pool: &DicePoolWithContext<'_>) -> Result<RolledDicePool,
|
||||||
return Err(DiceRollingError::ExpressionTooLarge.into());
|
return Err(DiceRollingError::ExpressionTooLarge.into());
|
||||||
}
|
}
|
||||||
|
|
||||||
let num_dice = crate::dice::calculate_dice_amount(&pool.0.amounts, &pool.1).await?;
|
let num_dice = crate::logic::calculate_dice_amount(&pool.0.amounts, &pool.1).await?;
|
||||||
let mut roller = RngDieRoller(rand::thread_rng());
|
let mut roller = RngDieRoller(rand::thread_rng());
|
||||||
|
|
||||||
if num_dice > 0 {
|
if num_dice > 0 {
|
||||||
|
@ -578,7 +578,7 @@ mod tests {
|
||||||
let pool = DicePool::new(amounts, DicePoolModifiers::default());
|
let pool = DicePool::new(amounts, DicePoolModifiers::default());
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
crate::dice::calculate_dice_amount(&pool.amounts, &ctx)
|
crate::logic::calculate_dice_amount(&pool.amounts, &ctx)
|
||||||
.await
|
.await
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
10
|
10
|
||||||
|
|
|
@ -2,7 +2,7 @@ use crate::context::Context;
|
||||||
use crate::db::Variables;
|
use crate::db::Variables;
|
||||||
use crate::error::{BotError, DiceRollingError};
|
use crate::error::{BotError, DiceRollingError};
|
||||||
use crate::parser::{Amount, Element};
|
use crate::parser::{Amount, Element};
|
||||||
use crate::{dice::calculate_single_die_amount, parser::DiceParsingError};
|
use crate::{logic::calculate_single_die_amount, parser::DiceParsingError};
|
||||||
use rand::rngs::StdRng;
|
use rand::rngs::StdRng;
|
||||||
use rand::Rng;
|
use rand::Rng;
|
||||||
use rand::SeedableRng;
|
use rand::SeedableRng;
|
||||||
|
|
45
src/dice.rs
45
src/dice.rs
|
@ -1,45 +0,0 @@
|
||||||
use crate::context::Context;
|
|
||||||
use crate::db::Variables;
|
|
||||||
use crate::error::BotError;
|
|
||||||
use crate::error::DiceRollingError;
|
|
||||||
use crate::parser::Amount;
|
|
||||||
use crate::parser::Element as NewElement;
|
|
||||||
use futures::stream::{self, StreamExt, TryStreamExt};
|
|
||||||
use std::slice;
|
|
||||||
|
|
||||||
/// Calculate the amount of dice to roll by consulting the database
|
|
||||||
/// and replacing variables with corresponding the amount. Errors out
|
|
||||||
/// if it cannot find a variable defined, or if the database errors.
|
|
||||||
pub async fn calculate_single_die_amount(
|
|
||||||
amount: &Amount,
|
|
||||||
ctx: &Context<'_>,
|
|
||||||
) -> Result<i32, BotError> {
|
|
||||||
calculate_dice_amount(slice::from_ref(amount), ctx).await
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Calculate the amount of dice to roll by consulting the database
|
|
||||||
/// and replacing variables with corresponding amounts. Errors out if
|
|
||||||
/// it cannot find a variable defined, or if the database errors.
|
|
||||||
pub async fn calculate_dice_amount(amounts: &[Amount], ctx: &Context<'_>) -> Result<i32, BotError> {
|
|
||||||
let stream = stream::iter(amounts);
|
|
||||||
let variables = &ctx
|
|
||||||
.db
|
|
||||||
.get_user_variables(&ctx.username, ctx.room_id().as_str())
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
use DiceRollingError::VariableNotFound;
|
|
||||||
let dice_amount: i32 = stream
|
|
||||||
.then(|amount| async move {
|
|
||||||
match &amount.element {
|
|
||||||
NewElement::Number(num_dice) => Ok(num_dice * amount.operator.mult()),
|
|
||||||
NewElement::Variable(variable) => variables
|
|
||||||
.get(variable)
|
|
||||||
.ok_or_else(|| VariableNotFound(variable.clone()))
|
|
||||||
.map(|i| *i),
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.try_fold(0, |total, num_dice| async move { Ok(total + num_dice) })
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
Ok(dice_amount)
|
|
||||||
}
|
|
|
@ -6,7 +6,6 @@ pub mod config;
|
||||||
pub mod context;
|
pub mod context;
|
||||||
pub mod cthulhu;
|
pub mod cthulhu;
|
||||||
pub mod db;
|
pub mod db;
|
||||||
pub mod dice;
|
|
||||||
pub mod error;
|
pub mod error;
|
||||||
mod help;
|
mod help;
|
||||||
pub mod logic;
|
pub mod logic;
|
||||||
|
|
46
src/logic.rs
46
src/logic.rs
|
@ -1,9 +1,12 @@
|
||||||
use crate::db::Rooms;
|
use crate::context::Context;
|
||||||
use crate::error::BotError;
|
use crate::db::{Rooms, Variables};
|
||||||
|
use crate::error::{BotError, DiceRollingError};
|
||||||
use crate::matrix;
|
use crate::matrix;
|
||||||
use crate::models::RoomInfo;
|
use crate::models::RoomInfo;
|
||||||
use futures::stream::{self, StreamExt};
|
use crate::parser::{Amount, Element};
|
||||||
|
use futures::stream::{self, StreamExt, TryStreamExt};
|
||||||
use matrix_sdk::{self, identifiers::RoomId, Client};
|
use matrix_sdk::{self, identifiers::RoomId, Client};
|
||||||
|
use std::slice;
|
||||||
|
|
||||||
/// Record the information about a room, including users in it.
|
/// Record the information about a room, including users in it.
|
||||||
pub async fn record_room_information(
|
pub async fn record_room_information(
|
||||||
|
@ -46,3 +49,40 @@ pub async fn record_room_information(
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Calculate the amount of dice to roll by consulting the database
|
||||||
|
/// and replacing variables with corresponding the amount. Errors out
|
||||||
|
/// if it cannot find a variable defined, or if the database errors.
|
||||||
|
pub async fn calculate_single_die_amount(
|
||||||
|
amount: &Amount,
|
||||||
|
ctx: &Context<'_>,
|
||||||
|
) -> Result<i32, BotError> {
|
||||||
|
calculate_dice_amount(slice::from_ref(amount), ctx).await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Calculate the amount of dice to roll by consulting the database
|
||||||
|
/// and replacing variables with corresponding amounts. Errors out if
|
||||||
|
/// it cannot find a variable defined, or if the database errors.
|
||||||
|
pub async fn calculate_dice_amount(amounts: &[Amount], ctx: &Context<'_>) -> Result<i32, BotError> {
|
||||||
|
let stream = stream::iter(amounts);
|
||||||
|
let variables = &ctx
|
||||||
|
.db
|
||||||
|
.get_user_variables(&ctx.username, ctx.room_id().as_str())
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
use DiceRollingError::VariableNotFound;
|
||||||
|
let dice_amount: i32 = stream
|
||||||
|
.then(|amount| async move {
|
||||||
|
match &amount.element {
|
||||||
|
Element::Number(num_dice) => Ok(num_dice * amount.operator.mult()),
|
||||||
|
Element::Variable(variable) => variables
|
||||||
|
.get(variable)
|
||||||
|
.ok_or_else(|| VariableNotFound(variable.clone()))
|
||||||
|
.map(|i| *i),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.try_fold(0, |total, num_dice| async move { Ok(total + num_dice) })
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(dice_amount)
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue