create reminders :)

web/src/routes/dashboard/guild.rs

@@ -18,7 +18,9 @@ use crate::{
         MAX_EMBED_DESCRIPTION_LENGTH, MAX_EMBED_FOOTER_LENGTH, MAX_EMBED_TITLE_LENGTH,
         MAX_URL_LENGTH, MAX_USERNAME_LENGTH, MIN_INTERVAL,
     },
-    routes::dashboard::{create_database_channel, DeleteReminder, Reminder},
+    routes::dashboard::{
+        create_database_channel, generate_uid, name_default, DeleteReminder, Reminder,
+    },
 };
 
 #[derive(Serialize)]
@@ -193,11 +195,13 @@ pub async fn create_reminder(
     if reminder.utc_time < Utc::now().naive_utc() {
         return json!({"error": "Time must be in the future"});
     }
-    if reminder.interval_months.unwrap_or(0) * 30 * DAY as u32
-        + reminder.interval_seconds.unwrap_or(0)
-        < *MIN_INTERVAL
-    {
-        return json!({"error": "Interval too short"});
+    if reminder.interval_seconds.is_some() || reminder.interval_months.is_some() {
+        if reminder.interval_months.unwrap_or(0) * 30 * DAY as u32
+            + reminder.interval_seconds.unwrap_or(0)
+            < *MIN_INTERVAL
+        {
+            return json!({"error": "Interval too short"});
+        }
     }
 
     // check patreon if necessary
@@ -209,9 +213,12 @@ pub async fn create_reminder(
         }
     }
 
+    let name = if reminder.name.is_empty() { name_default() } else { reminder.name.clone() };
+
     // write to db
     match sqlx::query!(
         "INSERT INTO reminders (
+         uid,
          channel_id,
          avatar,
          content,
@@ -234,30 +241,8 @@ pub async fn create_reminder(
          tts,
          username,
          `utc_time`
-        ) VALUES (
-         channel_id = ?,
-         avatar = ?,
-         content = ?,
-         embed_author = ?,
-         embed_author_url = ?,
-         embed_color = ?,
-         embed_description = ?,
-         embed_footer = ?,
-         embed_footer_url = ?,
-         embed_image_url = ?,
-         embed_thumbnail_url = ?,
-         embed_title = ?,
-         enabled = ?,
-         expires = ?,
-         interval_seconds = ?,
-         interval_months = ?,
-         name = ?,
-         pin = ?,
-         restartable = ?,
-         tts = ?,
-         username = ?,
-         `utc_time` = ?
-        )",
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+        generate_uid(),
         channel,
         reminder.avatar,
         reminder.content,
@@ -274,7 +259,7 @@ pub async fn create_reminder(
         reminder.expires,
         reminder.interval_seconds,
         reminder.interval_months,
-        reminder.name,
+        name,
         reminder.pin,
         reminder.restartable,
         reminder.tts,

web/src/routes/dashboard/mod.rs

@@ -1,17 +1,17 @@
 use std::collections::HashMap;
 
 use chrono::naive::NaiveDateTime;
+use rand::{rngs::OsRng, seq::IteratorRandom};
 use rocket::{http::CookieJar, response::Redirect};
 use rocket_dyn_templates::Template;
 use serde::{Deserialize, Serialize};
-use serenity::{
-    client::Context,
-    http::{CacheHttp, Http},
-    model::id::ChannelId,
-};
-use sqlx::{Executor, Pool};
+use serenity::{http::Http, model::id::ChannelId};
+use sqlx::Executor;
 
-use crate::{consts::DEFAULT_AVATAR, Database, Error};
+use crate::{
+    consts::{CHARACTERS, DEFAULT_AVATAR},
+    Database, Error,
+};
 
 pub mod guild;
 pub mod user;
@@ -37,21 +37,30 @@ pub struct Reminder {
     embed_image_url: Option<String>,
     embed_thumbnail_url: Option<String>,
     embed_title: String,
-    enabled: i8,
+    enabled: bool,
     expires: Option<NaiveDateTime>,
     interval_seconds: Option<u32>,
     interval_months: Option<u32>,
     #[serde(default = "name_default")]
     name: String,
-    pin: i8,
-    restartable: i8,
-    tts: i8,
+    pin: bool,
+    restartable: bool,
+    tts: bool,
     #[serde(default)]
     uid: String,
     username: Option<String>,
     utc_time: NaiveDateTime,
 }
 
+pub fn generate_uid() -> String {
+    let mut generator: OsRng = Default::default();
+
+    (0..64)
+        .map(|_| CHARACTERS.chars().choose(&mut generator).unwrap().to_owned().to_string())
+        .collect::<Vec<String>>()
+        .join("")
+}
+
 // https://github.com/serde-rs/json/issues/329#issuecomment-305608405
 mod string {
     use std::{fmt::Display, str::FromStr};

web/src/routes/dashboard/user.rs

@@ -282,7 +282,7 @@ pub async fn get_reminders(
         if let Some(channel_id) = dm_channel {
             let reminders = sqlx::query_as!(
                 Reminder,
-                "SELECT
+                r#"SELECT
                  reminders.attachment,
                  reminders.attachment_name,
                  reminders.avatar,
@@ -297,18 +297,18 @@ pub async fn get_reminders(
                  reminders.embed_image_url,
                  reminders.embed_thumbnail_url,
                  reminders.embed_title,
-                 reminders.enabled,
+                 reminders.enabled as "enabled:_",
                  reminders.expires,
                  reminders.interval_seconds,
                  reminders.interval_months,
                  reminders.name,
-                 reminders.pin,
-                 reminders.restartable,
-                 reminders.tts,
+                 reminders.pin as "pin:_",
+                 reminders.restartable as "restartable:_",
+                 reminders.tts as "tts:_",
                  reminders.uid,
                  reminders.username,
                  reminders.utc_time
-                 FROM reminders INNER JOIN channels ON channels.id = reminders.channel_id WHERE channels.channel = ?",
+                 FROM reminders INNER JOIN channels ON channels.id = reminders.channel_id WHERE channels.channel = ?"#,
                 channel_id
             )
                 .fetch_all(pool.inner())