fields are now json and work. fix for intervals. moved some code together

2022-04-07 17:13:02 +01:00
parent d946ef1dca
commit 85d27c5bba
13 changed files with 270 additions and 539 deletions
--- a/web/src/routes/dashboard/guild.rs
+++ b/web/src/routes/dashboard/guild.rs
@ -19,12 +19,13 @@ use crate::{
    check_guild_subscription, check_subscription,
    consts::{
        DAY, DISCORD_CDN, MAX_CONTENT_LENGTH, MAX_EMBED_AUTHOR_LENGTH,
-        MAX_EMBED_DESCRIPTION_LENGTH, MAX_EMBED_FOOTER_LENGTH, MAX_EMBED_TITLE_LENGTH,
+        MAX_EMBED_DESCRIPTION_LENGTH, MAX_EMBED_FIELDS, MAX_EMBED_FIELD_TITLE_LENGTH,
+        MAX_EMBED_FIELD_VALUE_LENGTH, MAX_EMBED_FOOTER_LENGTH, MAX_EMBED_TITLE_LENGTH,
        MAX_URL_LENGTH, MAX_USERNAME_LENGTH, MIN_INTERVAL,
    },
    routes::dashboard::{
-        create_database_channel, generate_uid, name_default, DeleteReminder, JsonReminder,
-        PatchReminder, Reminder,
+        create_database_channel, generate_uid, name_default, DeleteReminder, PatchReminder,
+        Reminder,
    },
 };

@ -133,7 +134,7 @@ pub async fn get_guild_roles(id: u64, cookies: &CookieJar<'_>, ctx: &State<Conte
 #[post("/api/guild/<id>/reminders", data = "<reminder>")]
 pub async fn create_reminder(
    id: u64,
-    reminder: Json<JsonReminder>,
+    reminder: Json<Reminder>,
    cookies: &CookieJar<'_>,
    serenity_context: &State<Context>,
    pool: &State<Pool<MySql>>,
@ -180,6 +181,13 @@ pub async fn create_reminder(
    check_length!(MAX_EMBED_TITLE_LENGTH, reminder.embed_title);
    check_length!(MAX_EMBED_AUTHOR_LENGTH, reminder.embed_author);
    check_length!(MAX_EMBED_FOOTER_LENGTH, reminder.embed_footer);
+    check_length_opt!(MAX_EMBED_FIELDS, reminder.embed_fields);
+    if let Some(fields) = &reminder.embed_fields {
+        for field in &fields.0 {
+            check_length!(MAX_EMBED_FIELD_VALUE_LENGTH, field.value);
+            check_length!(MAX_EMBED_FIELD_TITLE_LENGTH, field.title);
+        }
+    }
    check_length_opt!(MAX_USERNAME_LENGTH, reminder.username);
    check_length_opt!(
        MAX_URL_LENGTH,
@ -245,6 +253,7 @@ pub async fn create_reminder(
         embed_image_url,
         embed_thumbnail_url,
         embed_title,
+         embed_fields,
         enabled,
         expires,
         interval_seconds,
@ -255,7 +264,7 @@ pub async fn create_reminder(
         tts,
         username,
         `utc_time`
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
        new_uid,
        attachment_data,
        reminder.attachment_name,
@ -271,6 +280,7 @@ pub async fn create_reminder(
        reminder.embed_image_url,
        reminder.embed_thumbnail_url,
        reminder.embed_title,
+        reminder.embed_fields,
        reminder.enabled,
        reminder.expires,
        reminder.interval_seconds,
@ -302,6 +312,7 @@ pub async fn create_reminder(
             reminders.embed_image_url,
             reminders.embed_thumbnail_url,
             reminders.embed_title,
+             reminders.embed_fields,
             reminders.enabled,
             reminders.expires,
             reminders.interval_seconds,
@ -324,7 +335,7 @@ pub async fn create_reminder(
        .unwrap_or_else(|e| {
            warn!("Failed to complete SQL query: {:?}", e);

-            json!({"error": "Could not load reminders"})
+            json!({"error": "Could not load reminder"})
        }),

        Err(e) => {
@ -365,6 +376,7 @@ pub async fn get_reminders(id: u64, ctx: &State<Context>, pool: &State<Pool<MySq
                 reminders.embed_image_url,
                 reminders.embed_thumbnail_url,
                 reminders.embed_title,
+                 reminders.embed_fields,
                 reminders.enabled,
                 reminders.expires,
                 reminders.interval_seconds,
@ -421,6 +433,7 @@ pub async fn edit_reminder(
        embed_image_url,
        embed_thumbnail_url,
        embed_title,
+        embed_fields,
        enabled,
        expires,
        interval_seconds,
@ -507,6 +520,7 @@ pub async fn edit_reminder(
         reminders.embed_image_url,
         reminders.embed_thumbnail_url,
         reminders.embed_title,
+         reminders.embed_fields,
         reminders.enabled,
         reminders.expires,
         reminders.interval_seconds,
--- a/web/src/routes/dashboard/mod.rs
+++ b/web/src/routes/dashboard/mod.rs
@ -6,7 +6,7 @@ use rocket::{http::CookieJar, response::Redirect};
 use rocket_dyn_templates::Template;
 use serde::{Deserialize, Serialize};
 use serenity::{http::Http, model::id::ChannelId};
-use sqlx::Executor;
+use sqlx::{types::Json, Executor};

 use crate::{
    consts::{CHARACTERS, DEFAULT_AVATAR},
@ -30,39 +30,7 @@ fn channel_default() -> u64 {
 pub struct EmbedField {
    title: String,
    value: String,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct JsonReminder {
-    attachment: Option<String>,
-    attachment_name: Option<String>,
-    avatar: Option<String>,
-    #[serde(with = "string")]
-    channel: u64,
-    content: String,
-    embed_author: String,
-    embed_author_url: Option<String>,
-    embed_color: u32,
-    embed_description: String,
-    embed_footer: String,
-    embed_footer_url: Option<String>,
-    embed_image_url: Option<String>,
-    embed_thumbnail_url: Option<String>,
-    embed_title: String,
-    embed_fields: Vec<EmbedField>,
-    enabled: bool,
-    expires: Option<NaiveDateTime>,
-    interval_seconds: Option<u32>,
-    interval_months: Option<u32>,
-    #[serde(default = "name_default")]
-    name: String,
-    pin: bool,
-    restartable: bool,
-    tts: bool,
-    #[serde(default)]
-    uid: String,
-    username: Option<String>,
-    utc_time: NaiveDateTime,
+    inline: bool,
 }

 #[derive(Serialize, Deserialize)]
@ -82,6 +50,7 @@ pub struct Reminder {
    embed_image_url: Option<String>,
    embed_thumbnail_url: Option<String>,
    embed_title: String,
+    embed_fields: Option<Json<Vec<EmbedField>>>,
    enabled: bool,
    expires: Option<NaiveDateTime>,
    interval_seconds: Option<u32>,
@ -130,7 +99,7 @@ pub struct PatchReminder {
    #[serde(default)]
    embed_title: Unset<String>,
    #[serde(default)]
-    embed_fields: Unset<EmbedField>,
+    embed_fields: Unset<Json<Vec<EmbedField>>>,
    #[serde(default)]
    enabled: Unset<bool>,
    #[serde(default)]
--- a/web/src/routes/dashboard/user.rs
+++ b/web/src/routes/dashboard/user.rs
@ -11,14 +11,13 @@ use serde::{Deserialize, Serialize};
 use serenity::{
    client::Context,
    model::{
-        id::{GuildId, RoleId, UserId},
+        id::{GuildId, RoleId},
        permissions::Permissions,
    },
 };
 use sqlx::{MySql, Pool};

-use super::Reminder;
-use crate::{consts::DISCORD_API, routes::dashboard::DeleteReminder};
+use crate::consts::DISCORD_API;

 #[derive(Serialize)]
 struct UserInfo {
@ -164,241 +163,3 @@ pub async fn get_user_guilds(cookies: &CookieJar<'_>, reqwest_client: &State<Cli
        json!({"error": "Not authorized"})
    }
 }
-
-#[post("/api/user/reminders", data = "<reminder>")]
-pub async fn create_reminder(
-    reminder: Json<Reminder>,
-    _ctx: &State<Context>,
-    pool: &State<Pool<MySql>>,
-) -> JsonValue {
-    match sqlx::query!(
-        "INSERT INTO reminders (
-         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 (
-         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` = ?
-        )",
-        reminder.avatar,
-        reminder.content,
-        reminder.embed_author,
-        reminder.embed_author_url,
-        reminder.embed_color,
-        reminder.embed_description,
-        reminder.embed_footer,
-        reminder.embed_footer_url,
-        reminder.embed_image_url,
-        reminder.embed_thumbnail_url,
-        reminder.embed_title,
-        reminder.enabled,
-        reminder.expires,
-        reminder.interval_seconds,
-        reminder.interval_months,
-        reminder.name,
-        reminder.pin,
-        reminder.restartable,
-        reminder.tts,
-        reminder.username,
-        reminder.utc_time,
-    )
-    .execute(pool.inner())
-    .await
-    {
-        Ok(_) => {
-            json!({})
-        }
-        Err(e) => {
-            warn!("Error in `create_reminder`: {:?}", e);
-
-            json!({"error": "Could not create reminder"})
-        }
-    }
-}
-
-#[get("/api/user/reminders")]
-pub async fn get_reminders(
-    pool: &State<Pool<MySql>>,
-    cookies: &CookieJar<'_>,
-    ctx: &State<Context>,
-) -> JsonValue {
-    if let Some(user_id) =
-        cookies.get_private("userid").map(|c| c.value().parse::<u64>().ok()).flatten()
-    {
-        let query_res = sqlx::query!(
-            "SELECT channel FROM channels INNER JOIN users ON users.dm_channel = channels.id WHERE users.user = ?",
-            user_id
-        )
-        .fetch_one(pool.inner())
-        .await;
-
-        let dm_channel = if let Ok(query) = query_res {
-            Some(query.channel)
-        } else {
-            if let Ok(dm_channel) = UserId(user_id).create_dm_channel(&ctx.inner()).await {
-                Some(dm_channel.id.as_u64().to_owned())
-            } else {
-                None
-            }
-        };
-
-        if let Some(channel_id) = dm_channel {
-            let reminders = sqlx::query_as!(
-                Reminder,
-                r#"SELECT
-                 reminders.attachment,
-                 reminders.attachment_name,
-                 reminders.avatar,
-                 channels.channel,
-                 reminders.content,
-                 reminders.embed_author,
-                 reminders.embed_author_url,
-                 reminders.embed_color,
-                 reminders.embed_description,
-                 reminders.embed_footer,
-                 reminders.embed_footer_url,
-                 reminders.embed_image_url,
-                 reminders.embed_thumbnail_url,
-                 reminders.embed_title,
-                 reminders.enabled as "enabled:_",
-                 reminders.expires,
-                 reminders.interval_seconds,
-                 reminders.interval_months,
-                 reminders.name,
-                 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 = ?"#,
-                channel_id
-            )
-                .fetch_all(pool.inner())
-                .await
-                .unwrap_or(vec![]);
-
-            json!(reminders)
-        } else {
-            json!({"error": "User's DM channel could not be determined"})
-        }
-    } else {
-        json!({"error": "Not authorized"})
-    }
-}
-
-#[put("/api/user/reminders", data = "<reminder>")]
-pub async fn overwrite_reminder(reminder: Json<Reminder>, pool: &State<Pool<MySql>>) -> JsonValue {
-    match sqlx::query!(
-        "UPDATE reminders SET
-         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` = ?
-         WHERE uid = ?",
-        reminder.avatar,
-        reminder.content,
-        reminder.embed_author,
-        reminder.embed_author_url,
-        reminder.embed_color,
-        reminder.embed_description,
-        reminder.embed_footer,
-        reminder.embed_footer_url,
-        reminder.embed_image_url,
-        reminder.embed_thumbnail_url,
-        reminder.embed_title,
-        reminder.enabled,
-        reminder.expires,
-        reminder.interval_seconds,
-        reminder.interval_months,
-        reminder.name,
-        reminder.pin,
-        reminder.restartable,
-        reminder.tts,
-        reminder.username,
-        reminder.utc_time,
-        reminder.uid
-    )
-    .execute(pool.inner())
-    .await
-    {
-        Ok(_) => {
-            json!({})
-        }
-        Err(e) => {
-            warn!("Error in `overwrite_reminder`: {:?}", e);
-
-            json!({"error": "Could not modify reminder"})
-        }
-    }
-}
-
-#[delete("/api/user/reminders", data = "<reminder>")]
-pub async fn delete_reminder(
-    reminder: Json<DeleteReminder>,
-    pool: &State<Pool<MySql>>,
-) -> JsonValue {
-    if sqlx::query!("DELETE FROM reminders WHERE uid = ?", reminder.uid)
-        .execute(pool.inner())
-        .await
-        .is_ok()
-    {
-        json!({})
-    } else {
-        json!({"error": "Could not delete reminder"})
-    }
-}