3 Commits

Author SHA1 Message Date
1a03c2471b Remove submodule 2023-12-21 16:37:21 +00:00
a476f43f28 Reset intervals correctly 2023-11-12 17:17:22 +00:00
17192b0f89 Correct merge errors 2023-11-12 10:15:29 +00:00
5 changed files with 15 additions and 13 deletions

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "reminder-dashboard"]
path = reminder-dashboard
url = gitea@gitea.jellypro.xyz:jude/reminder-dashboard

8
Cargo.lock generated
View File

@ -2195,11 +2195,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
[[package]]
name = "reminder-rs"
<<<<<<< HEAD
version = "1.6.50"
=======
version = "1.6.48"
>>>>>>> 97f186d (Add metrics)
dependencies = [
"base64 0.21.5",
"chrono",
@ -2227,11 +2223,7 @@ dependencies = [
[[package]]
name = "reminder_web"
<<<<<<< HEAD
version = "0.1.4"
=======
version = "0.1.3"
>>>>>>> 97f186d (Add metrics)
dependencies = [
"base64 0.13.1",
"chrono",

View File

@ -235,6 +235,21 @@ pub async fn edit_reminder(
]);
}
}
} else {
sqlx::query!(
"
UPDATE reminders
SET interval_seconds = NULL, interval_days = NULL, interval_months = NULL
WHERE uid = ?
",
reminder.uid
)
.execute(transaction.executor())
.await
.map_err(|e| {
warn!("Error updating reminder interval: {:?}", e);
json!({ "reminder": Option::<Reminder>::None, "errors": vec!["Unknown error"] })
})?;
}
if reminder.channel > 0 {

View File

@ -8,7 +8,6 @@ use rocket::{
response::Redirect,
serde::json::json,
};
use rocket_dyn_templates::Template;
use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
use serenity::{
client::Context,