Release 0.1.1

Fix a bug, add better error handling

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tg-dev-srv-bot"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2024"
 license = "GPL-3.0-or-later"
 description = "Bot for the TeenGovernment Development Server"
@@ -13,6 +13,7 @@ homepage = "https://git.ewenlau.net/ewenlau/tg-dev-srv-bot"
 dotenv = "0.15.0"
 exmex = "0.21.0"
 poise = "0.6.2"
+regex = "1.12.4"
 rug = "1.30.0"
 serenity = "0.12.5"
 sqlx = { version = "0.9.0", features = ["postgres", "runtime-tokio", "macros"] }

README.md

@@ -6,4 +6,4 @@ Not really meant for any other server, but feel free to use it if you'd like.
 
 The bot is really made to be used with Docker, but you can run it locally.
 
-An image is available at git.ewenlau.net/ewenlau/tg-dev-srv-bot:release for the stable version and git.ewenlau.net/ewenlau/tg-dev-srv-bot:dev for the development (or testing) version.
+An image is available at git.ewenlau.net/ewenlau/tg-dev-srv-bot:latest for the stable version and git.ewenlau.net/ewenlau/tg-dev-srv-bot:dev for the development (or testing) version.

docker-compose.example.yml

@@ -21,7 +21,7 @@ services:
       context: .
       dockerfile: Dockerfile
     # OR pull from registry
-    # image: git.ewenlau.net/ewenlau/tg-dev-srv-bot:release
+    # image: git.ewenlau.net/ewenlau/tg-dev-srv-bot:latest
     # image: git.ewenlau.net/ewenlau/tg-dev-srv-bot:dev
     container_name: tg-dev-srv-bot
     restart: always

src/commands/calc.rs

@@ -1,6 +1,10 @@
 use crate::{Context, Error};
 use tracing::{debug, trace, info};
 use crate::shared_functions::trace_message;
+use regex::Regex;
+use std::sync::LazyLock;
+
+static find_sci_notation_re: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"([0-9]+(?:\.[0-9]+)?)e([+-]?[0-9]+)").unwrap());
 
 #[derive(Debug, poise::ChoiceParameter)]
 pub enum Precision {
@@ -24,10 +28,13 @@ pub async fn calc(ctx: Context<'_>,
     let response_message = ctx.say(msg).await?;
     let start_time = std::time::Instant::now();
     trace!("Saving start time: {:?}", start_time);
+    let processed_expr = find_sci_notation_re.replace_all(&expression, "($1 * 10^($2))");
+    trace!("Processed expression: {}", processed_expr);
+    
     let value = match precision {
-        Some(Precision::Bits32) => exmex::eval_str::<f32>(&expression).map_err(|err| err.to_string())?.to_string(),
+        Some(Precision::Bits32) => exmex::eval_str::<f32>(&processed_expr).map_err(|err| err.to_string())?.to_string(),
-        Some(Precision::Bits64) => exmex::eval_str::<f64>(&expression).map_err(|err| err.to_string())?.to_string(),
+        Some(Precision::Bits64) => exmex::eval_str::<f64>(&processed_expr).map_err(|err| err.to_string())?.to_string(),
-        None => exmex::eval_str::<f64>(&expression).map_err(|err| err.to_string())?.to_string(),
+        None => exmex::eval_str::<f64>(&processed_expr).map_err(|err| err.to_string())?.to_string(),
     };
     let end_time = std::time::Instant::now();
     trace!("Saving end time: {:?}", end_time);

src/main.rs

@@ -75,6 +75,18 @@ async fn main() {
             event_handler: |ctx, event, framework, user_data| {
                 Box::pin(event_handler::event_handler(ctx, event, framework, user_data))
             },
+            on_error: |error| Box::pin(async move {
+                match error {
+                    poise::FrameworkError::Command { error, ctx, .. } => {
+                        error!("Error in command `{}`: {:?}", ctx.command().name, error);
+                    }
+                    error => {
+                        if let Err(e) = poise::builtins::on_error(error).await {
+                            error!("Error while handling error: {}", e);
+                        }
+                    }
+                }
+            }),
             commands: vec![commands::ping(), commands::calc(), commands::manage_admins(), commands::manage_auto_role(), commands::version()],
             ..Default::default()
         })