From e4a8334b63bfd01b2cbfb0cbfd11d3d8e363451f Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 10 Apr 2021 12:20:23 +0200 Subject: [PATCH] Add timeout to qalc command Signed-off-by: trivernis --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/commands/misc/qalc.rs | 4 ++++ src/providers/qalc.rs | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1e9ee8a..bbfbc0b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2050,7 +2050,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tobi-rs" -version = "0.1.2" +version = "0.1.3" dependencies = [ "aspotify", "chrono", diff --git a/Cargo.toml b/Cargo.toml index cb07cd7..59f533d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tobi-rs" -version = "0.1.2" +version = "0.1.3" authors = ["trivernis "] edition = "2018" diff --git a/src/commands/misc/qalc.rs b/src/commands/misc/qalc.rs index 788f3f7..6fe90c2 100644 --- a/src/commands/misc/qalc.rs +++ b/src/commands/misc/qalc.rs @@ -30,6 +30,10 @@ async fn qalc(ctx: &Context, msg: &Message, args: Args) -> CommandResult { description += "\nRead the [Qalculate! Manual](https://qalculate.github.io/manual/index.html)"; } + if &result == "aborted\n" { + description = + "Calculation aborted after timeout. Try a less complex calculation.".to_string(); + } msg.channel_id .send_message(ctx, |f| { diff --git a/src/providers/qalc.rs b/src/providers/qalc.rs index a184e31..cc3bf1a 100644 --- a/src/providers/qalc.rs +++ b/src/providers/qalc.rs @@ -4,6 +4,6 @@ use crate::utils::process::{run_command_async, sanitize_argument}; /// Runs the qalc command with the given expression pub async fn qalc(expression: &str) -> BotResult { let expression = sanitize_argument(expression, true)?; - let result = run_command_async("qalc", &[&*expression]).await?; + let result = run_command_async("qalc", &["-m", "1000", &*expression]).await?; Ok(result) }