2020-08-27 23:56:19 +00:00
|
|
|
use crate::cofd::dice::DicePool;
|
2020-04-21 03:15:13 +00:00
|
|
|
use crate::dice::ElementExpression;
|
2020-10-04 21:32:50 +00:00
|
|
|
use crate::error::BotError;
|
2020-08-28 22:02:41 +00:00
|
|
|
use crate::help::HelpTopic;
|
2020-04-21 06:09:43 +00:00
|
|
|
use crate::roll::Roll;
|
|
|
|
|
2020-04-21 03:15:13 +00:00
|
|
|
pub mod parser;
|
|
|
|
|
2020-04-21 06:07:03 +00:00
|
|
|
pub struct Execution {
|
|
|
|
plain: String,
|
|
|
|
html: String,
|
2020-04-21 03:15:13 +00:00
|
|
|
}
|
|
|
|
|
2020-04-21 06:07:03 +00:00
|
|
|
impl Execution {
|
|
|
|
pub fn plain(&self) -> &str {
|
|
|
|
&self.plain
|
2020-04-21 03:15:13 +00:00
|
|
|
}
|
|
|
|
|
2020-04-21 06:07:03 +00:00
|
|
|
pub fn html(&self) -> &str {
|
|
|
|
&self.html
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub trait Command {
|
|
|
|
fn execute(&self) -> Execution;
|
2020-08-21 21:49:22 +00:00
|
|
|
fn name(&self) -> &'static str;
|
2020-04-21 06:07:03 +00:00
|
|
|
}
|
|
|
|
|
2020-08-21 21:49:22 +00:00
|
|
|
pub struct RollCommand(ElementExpression);
|
|
|
|
|
2020-04-21 06:07:03 +00:00
|
|
|
impl Command for RollCommand {
|
2020-08-21 21:49:22 +00:00
|
|
|
fn name(&self) -> &'static str {
|
|
|
|
"roll regular dice"
|
|
|
|
}
|
|
|
|
|
2020-04-21 06:07:03 +00:00
|
|
|
fn execute(&self) -> Execution {
|
|
|
|
let roll = self.0.roll();
|
|
|
|
let plain = format!("Dice: {}\nResult: {}", self.0, roll);
|
2020-04-21 06:09:43 +00:00
|
|
|
let html = format!(
|
2020-04-22 04:19:15 +00:00
|
|
|
"<p><strong>Dice:</strong> {}</p><p><strong>Result</strong>: {}</p>",
|
2020-04-21 06:09:43 +00:00
|
|
|
self.0, roll
|
|
|
|
);
|
|
|
|
Execution { plain, html }
|
2020-04-21 03:15:13 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-08-21 21:49:22 +00:00
|
|
|
pub struct PoolRollCommand(DicePool);
|
|
|
|
|
|
|
|
impl Command for PoolRollCommand {
|
|
|
|
fn name(&self) -> &'static str {
|
|
|
|
"roll dice pool"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn execute(&self) -> Execution {
|
2020-10-04 21:32:50 +00:00
|
|
|
let roll_result = self.0.roll();
|
|
|
|
|
|
|
|
let (plain, html) = match roll_result {
|
|
|
|
Ok(rolled_pool) => {
|
|
|
|
let plain = format!("Pool: {}\nResult: {}", rolled_pool, rolled_pool.roll);
|
|
|
|
let html = format!(
|
|
|
|
"<p><strong>Pool:</strong> {}</p><p><strong>Result</strong>: {}</p>",
|
|
|
|
rolled_pool, rolled_pool.roll
|
|
|
|
);
|
|
|
|
(plain, html)
|
|
|
|
}
|
|
|
|
Err(e) => {
|
|
|
|
let plain = format!("Error: {}", e);
|
|
|
|
let html = format!("<p><strong>Error:</strong> {}</p>", e);
|
|
|
|
(plain, html)
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2020-08-21 21:49:22 +00:00
|
|
|
Execution { plain, html }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-08-28 22:02:41 +00:00
|
|
|
pub struct HelpCommand(Option<HelpTopic>);
|
|
|
|
|
|
|
|
impl Command for HelpCommand {
|
|
|
|
fn name(&self) -> &'static str {
|
|
|
|
"help information"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn execute(&self) -> Execution {
|
|
|
|
let help = match &self.0 {
|
|
|
|
Some(topic) => topic.message(),
|
|
|
|
_ => "There is no help for this topic",
|
|
|
|
};
|
|
|
|
|
|
|
|
let plain = format!("Help: {}", help);
|
|
|
|
let html = format!("<p><strong>Help:</strong> {}", help.replace("\n", "<br/>"));
|
|
|
|
Execution { plain, html }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Parse a command string into a dynamic command execution trait
|
|
|
|
/// object. Returns an error if a command was recognized but not
|
2020-08-31 23:33:46 +00:00
|
|
|
/// parsed correctly. Returns Ok(None) if no command was recognized.
|
2020-10-04 21:32:50 +00:00
|
|
|
pub fn parse_command(s: &str) -> Result<Option<Box<dyn Command>>, BotError> {
|
|
|
|
// match parser::parse_command(s) {
|
|
|
|
// Ok(Some(command)) => match &command {
|
|
|
|
// //Any command, or text transformed into non-command is
|
|
|
|
// //sent upwards.
|
|
|
|
// ("", Some(_)) | (_, None) => Ok(command),
|
|
|
|
|
|
|
|
// //TODO replcae with nom all_consuming?
|
|
|
|
// //Any unconsumed input (whitespace should already be
|
|
|
|
// // stripped) is considered a parsing error.
|
|
|
|
// _ => Err(format!("{}: malformed expression", s)),
|
|
|
|
// },
|
|
|
|
// Err(err) => Err(err),
|
|
|
|
// }
|
|
|
|
parser::parse_command(s)
|
2020-04-21 03:15:13 +00:00
|
|
|
}
|
2020-08-21 21:49:22 +00:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn chance_die_is_not_malformed() {
|
|
|
|
assert!(parse_command("!chance").is_ok());
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn roll_malformed_expression_test() {
|
|
|
|
assert!(parse_command("!roll 1d20asdlfkj").is_err());
|
2020-08-30 20:48:52 +00:00
|
|
|
assert!(parse_command("!roll 1d20asdlfkj ").is_err());
|
2020-08-21 21:49:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2020-08-30 20:48:52 +00:00
|
|
|
fn roll_dice_pool_malformed_expression_test() {
|
2020-08-21 21:49:22 +00:00
|
|
|
assert!(parse_command("!pool 8abc").is_err());
|
2020-08-30 20:48:52 +00:00
|
|
|
assert!(parse_command("!pool 8abc ").is_err());
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn pool_whitespace_test() {
|
2020-10-04 21:32:50 +00:00
|
|
|
assert!(parse_command("!pool ns3:8 ")
|
2020-08-30 20:48:52 +00:00
|
|
|
.map(|p| p.is_some())
|
|
|
|
.expect("was error"));
|
2020-10-04 21:32:50 +00:00
|
|
|
assert!(parse_command(" !pool ns3:8")
|
2020-08-30 20:48:52 +00:00
|
|
|
.map(|p| p.is_some())
|
|
|
|
.expect("was error"));
|
2020-10-04 21:32:50 +00:00
|
|
|
assert!(parse_command(" !pool ns3:8 ")
|
2020-08-30 20:48:52 +00:00
|
|
|
.map(|p| p.is_some())
|
|
|
|
.expect("was error"));
|
|
|
|
}
|
|
|
|
|
2020-08-28 22:02:41 +00:00
|
|
|
#[test]
|
|
|
|
fn help_whitespace_test() {
|
|
|
|
assert!(parse_command("!help stuff ")
|
|
|
|
.map(|p| p.is_some())
|
|
|
|
.expect("was error"));
|
|
|
|
assert!(parse_command(" !help stuff")
|
|
|
|
.map(|p| p.is_some())
|
|
|
|
.expect("was error"));
|
|
|
|
assert!(parse_command(" !help stuff ")
|
|
|
|
.map(|p| p.is_some())
|
|
|
|
.expect("was error"));
|
|
|
|
}
|
|
|
|
|
2020-08-30 20:48:52 +00:00
|
|
|
#[test]
|
|
|
|
fn roll_whitespace_test() {
|
|
|
|
assert!(parse_command("!roll 1d4 + 5d6 -3 ")
|
|
|
|
.map(|p| p.is_some())
|
|
|
|
.expect("was error"));
|
|
|
|
assert!(parse_command("!roll 1d4 + 5d6 -3 ")
|
|
|
|
.map(|p| p.is_some())
|
|
|
|
.expect("was error"));
|
|
|
|
assert!(parse_command(" !roll 1d4 + 5d6 -3 ")
|
|
|
|
.map(|p| p.is_some())
|
|
|
|
.expect("was error"));
|
2020-08-21 21:49:22 +00:00
|
|
|
}
|
|
|
|
}
|