cron: validate expressions and allocate ids atomically

1 files changed, 12 insertions, 2 deletions

diff --git a/src/commands/cron.rs b/src/commands/cron.rs
index 301ae3d..94cf955 100644
--- a/src/commands/cron.rs
+++ b/src/commands/cron.rs
@@ -44,7 +44,12 @@ pub async fn dodaj_audio(
         ctx.data().copyparty.build_url_no_pw(&audio_filename)
     };
 
-    let guild_id = ctx.guild_id().ok_or_else(lang::err_not_in_guild)?;
+    if let Err(e) = crate::tasks::parse_cron(&cron_expression) {
+        ctx.say(lang::fmt_cron_invalid(&cron_expression, &e.to_string()))
+            .await?;
+        return Ok(());
+    }
+    let guild_id = ctx.guild_id().ok_or_else(|| lang::err_not_in_guild())?;
     if !ctx.data().copyparty.is_own_url(&full_url) {
         crate::net::ensure_public_http_url(&full_url).await?;
     }
@@ -77,7 +82,12 @@ pub async fn dodaj_wiadomość(
         _ => return Err(lang::err_bad_channel_type()),
     };
 
-    let guild_id = ctx.guild_id().ok_or_else(lang::err_not_in_guild)?;
+    if let Err(e) = crate::tasks::parse_cron(&cron_expression) {
+        ctx.say(lang::fmt_cron_invalid(&cron_expression, &e.to_string()))
+            .await?;
+        return Ok(());
+    }
+    let guild_id = ctx.guild_id().ok_or_else(|| lang::err_not_in_guild())?;
     database::add_cron_job(
         &ctx.data().db_pool,
         guild_id.get() as i64,