✨ Parse time using two_timer

Use fixed two_timer (custom git) - this one can parse "in 3 hours".

Author: berkus

Cargo.lock

@@ -35,4 +35,4 @@ serde = { version = "1.0", features = ["derive"] }
 teloxide = { version = "0.17", features = ["macros"] }
 tera = "1"
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
-two_timer = "2.2" # doesn't parse "in 3 hours"
+two_timer = { version = "2.2", git = "https://github.com/berkus/two-timer.git", branch = "updated" }

Cargo.toml

@@ -27,7 +27,6 @@ serde.workspace = true
 teloxide.workspace = true
 tera.workspace = true
 tokio.workspace = true
-two_timer.workspace = true
 
 [target.'cfg(target_os="linux")'.dependencies]
 procfs = "0.17"

bot/Cargo.toml

@@ -1,7 +1,7 @@
 // Async Rust implementation of the bot
 //
 // To make it usable it misses natty parsing lib implementation in rust
-// (There are now several rust impls including https://lib.rs/crates/two_timer and https://lib.rs/crates/intervalle)
+// Use https://lib.rs/crates/two_timer
 
 use {
     aegl_bot::{

bot/src/bin/bot.rs

@@ -9,7 +9,9 @@ publish = false
 name = "libbot"
 
 [dependencies]
+anyhow.workspace = true
 chrono.workspace = true
 chrono-tz.workspace = true
 culpa.workspace = true
 # entity.workspace = true
+two_timer.workspace = true

lib/Cargo.toml

@@ -1,6 +1,8 @@
 use {
+    anyhow::bail,
     chrono::{prelude::*, DateTime, Duration, TimeZone, Utc},
     chrono_tz::{Europe::Moscow, Tz},
+    culpa::throws,
     std::fmt::Write,
 };
 
@@ -10,6 +12,30 @@ use {
 pub type BotDateTime = chrono::DateTime<chrono::Utc>;
 pub type BotTime = chrono::NaiveTime; // UTC
 
+#[throws(anyhow::Error)]
+pub fn parse_time_spec(timespec: impl AsRef<str>) -> DateTime<Tz> {
+    let now = Local::now().with_timezone(&Moscow);
+    // Parse input in MSK timezone...
+    // @todo Honor TELEGRAM_BOT_TIMEZONE envvar
+    let start_time = match two_timer::parse(
+        timespec.as_ref(),
+        two_timer::Config::new(now).default_to_past(false),
+    ) {
+        Ok((start, _end, _found)) => start, //.and_utc(),
+        Err(_) => {
+            bail!("❌ Failed to parse time {}", timespec.as_ref())
+        }
+    };
+
+    // ...then convert back to UTC.
+    // let start_time = start_time.unwrap().0; //.and_utc();
+
+    // use chrono::Offset;
+    // let offset = start_time.offset().fix();
+
+    start_time
+}
+
 fn time_diff_string(duration: Duration) -> String {
     let times = vec![
         (Duration::days(365), "year"),