diff --git a/migrations/20230812111348_orphan_reminders.sql b/migrations/20230812111348_orphan_reminders.sql new file mode 100644 index 0000000..00bf1a7 --- /dev/null +++ b/migrations/20230812111348_orphan_reminders.sql @@ -0,0 +1,19 @@ +-- Drop existing constraint +ALTER TABLE `reminders` DROP CONSTRAINT `reminders_ibfk_1`; + +ALTER TABLE `reminders` MODIFY COLUMN `channel_id` INT UNSIGNED; +ALTER TABLE `reminders` ADD COLUMN `guild_id` INT UNSIGNED; + +ALTER TABLE `reminders` + ADD CONSTRAINT `guild_id_fk` + FOREIGN KEY (`guild_id`) + REFERENCES `guilds`(`id`) + ON DELETE CASCADE; + +ALTER TABLE `reminders` + ADD CONSTRAINT `channel_id_fk` + FOREIGN KEY (`channel_id`) + REFERENCES `channels`(`id`) + ON DELETE SET NULL; + +UPDATE `reminders` SET `guild_id` = (SELECT guilds.`id` FROM `channels` INNER JOIN `guilds` ON channels.guild_id = guilds.id WHERE reminders.channel_id = channels.id); diff --git a/migrations/20230903131153_reminder_status_timing.sql b/migrations/20230903131153_reminder_status_timing.sql new file mode 100644 index 0000000..742b1a9 --- /dev/null +++ b/migrations/20230903131153_reminder_status_timing.sql @@ -0,0 +1,4 @@ +ALTER TABLE reminders ADD COLUMN `status_change_time` DATETIME; + +-- This is a best-guess as to the status change time. +UPDATE reminders SET `status_change_time` = `utc_time`; diff --git a/postman/src/sender.rs b/postman/src/sender.rs index 08e83e9..9b325fe 100644 --- a/postman/src/sender.rs +++ b/postman/src/sender.rs @@ -310,6 +310,7 @@ WHERE reminders WHERE reminders.`utc_time` <= NOW() AND + reminders.`channel_id` IS NOT NULL AND `status` = 'pending' AND ( reminders.`interval_seconds` IS NOT NULL @@ -471,10 +472,17 @@ WHERE } async fn set_sent(&self, pool: impl Executor<'_, Database = Database> + Copy) { - sqlx::query!("UPDATE reminders SET `status` = 'sent' WHERE `id` = ?", self.id) - .execute(pool) - .await - .expect(&format!("Could not delete Reminder {}", self.id)); + sqlx::query!( + " + UPDATE reminders + SET `status` = 'sent', `status_change_time` = NOW() + WHERE `id` = ? + ", + self.id + ) + .execute(pool) + .await + .expect(&format!("Could not delete Reminder {}", self.id)); } async fn set_failed( diff --git a/src/component_models/mod.rs b/src/component_models/mod.rs index 9251796..ff1832a 100644 --- a/src/component_models/mod.rs +++ b/src/component_models/mod.rs @@ -166,15 +166,21 @@ impl ComponentDataModel { .await; } ComponentDataModel::DelSelector(selector) => { - let selected_id = component.data.values.join(","); + for id in &component.data.values { + match id.parse::() { + Ok(id) => { + if let Some(reminder) = Reminder::from_id(&data.database, id).await { + reminder.delete(&data.database).await.unwrap(); + } else { + warn!("Attempt to delete non-existent reminder"); + } + } - sqlx::query!( - "UPDATE reminders SET `status` = 'deleted' WHERE FIND_IN_SET(id, ?)", - selected_id - ) - .execute(&data.database) - .await - .unwrap(); + Err(e) => { + warn!("Error casting ID to integer: {:?}.", e); + } + } + } let reminders = Reminder::from_guild( &ctx, diff --git a/src/models/channel_data.rs b/src/models/channel_data.rs index 9983056..1b29675 100644 --- a/src/models/channel_data.rs +++ b/src/models/channel_data.rs @@ -10,6 +10,7 @@ pub struct ChannelData { pub webhook_id: Option, pub webhook_token: Option, pub paused: bool, + pub db_guild_id: Option, pub paused_until: Option, } @@ -22,7 +23,11 @@ impl ChannelData { if let Ok(c) = sqlx::query_as_unchecked!( Self, - "SELECT id, name, nudge, blacklisted, webhook_id, webhook_token, paused, paused_until FROM channels WHERE channel = ?", + " + SELECT id, name, nudge, blacklisted, webhook_id, webhook_token, paused, paused_until, + guild_id AS db_guild_id + FROM channels WHERE channel = ? + ", channel_id ) .fetch_one(pool) @@ -30,12 +35,18 @@ impl ChannelData { { Ok(c) } else { - let props = channel.to_owned().guild().map(|g| (g.guild_id.as_u64().to_owned(), g.name)); + let props = + channel.to_owned().guild().map(|g| (g.guild_id.as_u64().to_owned(), g.name)); - let (guild_id, channel_name) = if let Some((a, b)) = props { (Some(a), Some(b)) } else { (None, None) }; + let (guild_id, channel_name) = + if let Some((a, b)) = props { (Some(a), Some(b)) } else { (None, None) }; sqlx::query!( - "INSERT IGNORE INTO channels (channel, name, guild_id) VALUES (?, ?, (SELECT id FROM guilds WHERE guild = ?))", + " + INSERT IGNORE INTO channels + (channel, name, guild_id) + VALUES (?, ?, (SELECT id FROM guilds WHERE guild = ?)) + ", channel_id, channel_name, guild_id @@ -46,7 +57,10 @@ impl ChannelData { Ok(sqlx::query_as_unchecked!( Self, " -SELECT id, name, nudge, blacklisted, webhook_id, webhook_token, paused, paused_until FROM channels WHERE channel = ? + SELECT id, name, nudge, blacklisted, webhook_id, webhook_token, paused, + paused_until, guild_id AS db_guild_id + FROM channels + WHERE channel = ? ", channel_id ) @@ -58,9 +72,10 @@ SELECT id, name, nudge, blacklisted, webhook_id, webhook_token, paused, paused_u pub async fn commit_changes(&self, pool: &MySqlPool) { sqlx::query!( " -UPDATE channels SET name = ?, nudge = ?, blacklisted = ?, webhook_id = ?, webhook_token = ?, paused = ?, paused_until \ - = ? WHERE id = ? - ", + UPDATE channels + SET name = ?, nudge = ?, blacklisted = ?, webhook_id = ?, webhook_token = ?, + paused = ?, paused_until = ? + WHERE id = ?", self.name, self.nudge, self.blacklisted, diff --git a/src/models/reminder/builder.rs b/src/models/reminder/builder.rs index 0d2e6d8..8e3cf42 100644 --- a/src/models/reminder/builder.rs +++ b/src/models/reminder/builder.rs @@ -51,6 +51,7 @@ pub struct ReminderBuilder { pool: MySqlPool, uid: String, channel: u32, + guild: Option, thread_id: Option, utc_time: NaiveDateTime, timezone: String, @@ -86,6 +87,7 @@ impl ReminderBuilder { INSERT INTO reminders ( `uid`, `channel_id`, + `guild_id`, `utc_time`, `timezone`, `interval_seconds`, @@ -110,11 +112,13 @@ INSERT INTO reminders ( ?, ?, ?, + ?, ? ) ", self.uid, self.channel, + self.guild, utc_time, self.timezone, self.interval_seconds, @@ -247,10 +251,10 @@ impl<'a> MultiReminderBuilder<'a> { { Err(ReminderError::UserBlockedDm) } else { - Ok(user_data.dm_channel) + Ok((user_data.dm_channel, None)) } } else { - Ok(user_data.dm_channel) + Ok((user_data.dm_channel, None)) } } else { Err(ReminderError::InvalidTag) @@ -297,13 +301,13 @@ impl<'a> MultiReminderBuilder<'a> { .commit_changes(&self.ctx.data().database) .await; - Ok(channel_data.id) + Ok((channel_data.id, channel_data.db_guild_id)) } Err(e) => Err(ReminderError::DiscordError(e.to_string())), } } else { - Ok(channel_data.id) + Ok((channel_data.id, channel_data.db_guild_id)) } } } else { @@ -317,7 +321,8 @@ impl<'a> MultiReminderBuilder<'a> { let builder = ReminderBuilder { pool: self.ctx.data().database.clone(), uid: generate_uid(), - channel: c, + channel: c.0, + guild: c.1, thread_id, utc_time: self.utc_time, timezone: self.timezone.to_string(), diff --git a/src/models/reminder/mod.rs b/src/models/reminder/mod.rs index 5e69971..edf9d24 100644 --- a/src/models/reminder/mod.rs +++ b/src/models/reminder/mod.rs @@ -304,10 +304,13 @@ WHERE &self, db: impl Executor<'_, Database = Database>, ) -> Result<(), sqlx::Error> { - sqlx::query!("UPDATE reminders SET `status` = 'deleted' WHERE uid = ?", self.uid) - .execute(db) - .await - .map(|_| ()) + sqlx::query!( + "UPDATE reminders SET `status` = 'deleted', `status_change_time` = NOW() WHERE uid = ?", + self.uid + ) + .execute(db) + .await + .map(|_| ()) } pub fn display_content(&self) -> &str { diff --git a/web/src/lib.rs b/web/src/lib.rs index 54631cd..c45e2d5 100644 --- a/web/src/lib.rs +++ b/web/src/lib.rs @@ -150,7 +150,8 @@ pub async fn initialize( .mount( "/dashboard", routes![ - routes::dashboard::dashboard, + routes::dashboard::dashboard_1, + routes::dashboard::dashboard_2, routes::dashboard::dashboard_home, routes::dashboard::user::get_user_info, routes::dashboard::user::update_user_info, diff --git a/web/src/routes/dashboard/export.rs b/web/src/routes/dashboard/export.rs index d1f33c1..ba02886 100644 --- a/web/src/routes/dashboard/export.rs +++ b/web/src/routes/dashboard/export.rs @@ -145,7 +145,7 @@ pub async fn import_reminders( attachment: record.attachment, attachment_name: record.attachment_name, avatar: record.avatar, - channel: channel_id, + channel: Some(channel_id), content: record.content, embed_author: record.embed_author, embed_author_url: record.embed_author_url, @@ -171,6 +171,8 @@ pub async fn import_reminders( uid: generate_uid(), username: record.username, utc_time: record.utc_time, + status: "pending".to_string(), + status_change_time: None, }; create_reminder( diff --git a/web/src/routes/dashboard/guild.rs b/web/src/routes/dashboard/guild.rs index 1f89aca..1adf4a8 100644 --- a/web/src/routes/dashboard/guild.rs +++ b/web/src/routes/dashboard/guild.rs @@ -318,76 +318,64 @@ pub async fn create_guild_reminder( .await } -#[get("/api/guild//reminders")] +#[get("/api/guild//reminders?")] pub async fn get_reminders( id: u64, cookies: &CookieJar<'_>, - ctx: &State, serenity_context: &State, pool: &State>, + status: Option, ) -> JsonResult { check_authorization!(cookies, serenity_context.inner(), id); - let channels_res = GuildId(id).channels(&ctx.inner()).await; + let status = status.unwrap_or("pending".to_string()); - match channels_res { - Ok(channels) => { - let channels = channels - .keys() - .into_iter() - .map(|k| k.as_u64().to_string()) - .collect::>() - .join(","); + sqlx::query_as_unchecked!( + Reminder, + " + 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, + IFNULL(reminders.embed_fields, '[]') AS embed_fields, + reminders.enabled, + reminders.expires, + reminders.interval_seconds, + reminders.interval_days, + reminders.interval_months, + reminders.name, + reminders.restartable, + reminders.tts, + reminders.uid, + reminders.username, + reminders.utc_time, + reminders.status, + reminders.status_change_time + FROM reminders + LEFT JOIN channels ON channels.id = reminders.channel_id + WHERE FIND_IN_SET(`status`, ?) AND reminders.guild_id = (SELECT id FROM guilds WHERE guild = ?)", + status, + id + ) + .fetch_all(pool.inner()) + .await + .map(|r| Ok(json!(r))) + .unwrap_or_else(|e| { + warn!("Failed to complete SQL query: {:?}", e); - sqlx::query_as_unchecked!( - Reminder, - "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, - IFNULL(reminders.embed_fields, '[]') AS embed_fields, - reminders.enabled, - reminders.expires, - reminders.interval_seconds, - reminders.interval_days, - reminders.interval_months, - reminders.name, - reminders.restartable, - reminders.tts, - reminders.uid, - reminders.username, - reminders.utc_time - FROM reminders - LEFT JOIN channels ON channels.id = reminders.channel_id - WHERE `status` = 'pending' AND FIND_IN_SET(channels.channel, ?)", - channels - ) - .fetch_all(pool.inner()) - .await - .map(|r| Ok(json!(r))) - .unwrap_or_else(|e| { - warn!("Failed to complete SQL query: {:?}", e); - - json_err!("Could not load reminders") - }) - } - Err(e) => { - warn!("Could not fetch channels from {}: {:?}", id, e); - - Ok(json!([])) - } - } + json_err!("Could not load reminders") + }) } #[patch("/api/guild//reminders", data = "")] @@ -586,7 +574,9 @@ pub async fn edit_reminder( reminders.tts, reminders.uid, reminders.username, - reminders.utc_time + reminders.utc_time, + reminders.status, + reminders.status_change_time FROM reminders LEFT JOIN channels ON channels.id = reminders.channel_id WHERE uid = ?", @@ -610,9 +600,12 @@ pub async fn delete_reminder( reminder: Json, pool: &State>, ) -> JsonResult { - match sqlx::query!("UPDATE reminders SET `status` = 'deleted' WHERE uid = ?", reminder.uid) - .execute(pool.inner()) - .await + match sqlx::query!( + "UPDATE reminders SET `status` = 'deleted', `status_change_time` = NOW() WHERE uid = ?", + reminder.uid + ) + .execute(pool.inner()) + .await { Ok(_) => Ok(json!({})), diff --git a/web/src/routes/dashboard/mod.rs b/web/src/routes/dashboard/mod.rs index 4168a4a..7a4d784 100644 --- a/web/src/routes/dashboard/mod.rs +++ b/web/src/routes/dashboard/mod.rs @@ -124,8 +124,8 @@ pub struct Reminder { attachment: Option>, attachment_name: Option, avatar: Option, - #[serde(with = "string")] - channel: u64, + #[serde(with = "string_opt")] + channel: Option, content: String, embed_author: String, embed_author_url: Option, @@ -150,6 +150,8 @@ pub struct Reminder { uid: String, username: Option, utc_time: NaiveDateTime, + status: String, + status_change_time: Option, } #[derive(Serialize, Deserialize)] @@ -308,6 +310,34 @@ mod string { } } +mod string_opt { + use std::{fmt::Display, str::FromStr}; + + use serde::{de, Deserialize, Deserializer, Serializer}; + + pub fn serialize(value: &Option, serializer: S) -> Result + where + T: Display, + S: Serializer, + { + match value { + Some(value) => serializer.collect_str(value), + None => serializer.serialize_none(), + } + } + + pub fn deserialize<'de, T, D>(deserializer: D) -> Result, D::Error> + where + T: FromStr, + T::Err: Display, + D: Deserializer<'de>, + { + Option::deserialize(deserializer)? + .map(|d: String| d.parse().map_err(de::Error::custom)) + .transpose() + } +} + mod base64s { use serde::{de, Deserialize, Deserializer, Serializer}; @@ -372,7 +402,7 @@ pub async fn create_reminder( } // validate channel - let channel = ChannelId(reminder.channel).to_channel_cached(&ctx); + let channel = reminder.channel.map(|c| ChannelId(c).to_channel_cached(&ctx)).flatten(); let channel_exists = channel.is_some(); let channel_matches_guild = @@ -380,14 +410,14 @@ pub async fn create_reminder( if !channel_matches_guild || !channel_exists { warn!( - "Error in `create_reminder`: channel {} not found for guild {} (channel exists: {})", + "Error in `create_reminder`: channel {:?} not found for guild {} (channel exists: {})", reminder.channel, guild_id, channel_exists ); return Err(json!({"error": "Channel not found"})); } - let channel = create_database_channel(&ctx, ChannelId(reminder.channel), pool).await; + let channel = create_database_channel(&ctx, ChannelId(reminder.channel.unwrap()), pool).await; if let Err(e) = channel { warn!("`create_database_channel` returned an error code: {:?}", e); @@ -479,6 +509,7 @@ pub async fn create_reminder( attachment, attachment_name, channel_id, + guild_id, avatar, content, embed_author, @@ -501,11 +532,12 @@ pub async fn create_reminder( tts, username, `utc_time` - ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new_uid, attachment_data, reminder.attachment_name, channel, + guild_id.0, reminder.avatar, reminder.content, reminder.embed_author, @@ -560,7 +592,9 @@ pub async fn create_reminder( reminders.tts, reminders.uid, reminders.username, - reminders.utc_time + reminders.utc_time, + reminders.status, + reminders.status_change_time FROM reminders LEFT JOIN channels ON channels.id = reminders.channel_id WHERE uid = ?", @@ -662,7 +696,17 @@ pub async fn dashboard_home(cookies: &CookieJar<'_>) -> Result")] -pub async fn dashboard(cookies: &CookieJar<'_>) -> Result { +pub async fn dashboard_1(cookies: &CookieJar<'_>) -> Result { + if cookies.get_private("userid").is_some() { + let map: HashMap<&str, String> = HashMap::new(); + Ok(Template::render("dashboard", &map)) + } else { + Err(Redirect::to("/login/discord")) + } +} + +#[get("/<_>/<_>")] +pub async fn dashboard_2(cookies: &CookieJar<'_>) -> Result { if cookies.get_private("userid").is_some() { let map: HashMap<&str, String> = HashMap::new(); Ok(Template::render("dashboard", &map)) diff --git a/web/static/css/style.css b/web/static/css/style.css index 6d4ea76..0bb3d1b 100644 --- a/web/static/css/style.css +++ b/web/static/css/style.css @@ -291,10 +291,19 @@ div.dashboard-sidebar:not(.mobile-sidebar) { flex-direction: column; } +ul.guildList { + flex-grow: 1; + flex-shrink: 1; + overflow: scroll; +} + div.dashboard-sidebar:not(.mobile-sidebar) .aside-footer { - position: fixed; - bottom: 0; - width: 226px; + flex-shrink: 0; + flex-grow: 0; +} + +div.dashboard-sidebar svg { + flex-shrink: 0; } div.mobile-sidebar { @@ -679,6 +688,76 @@ li.highlight { /* END */ +div.reminderError { + margin: 10px; + padding: 14px; + background-color: #f5f5f5; + border-radius: 8px; +} + +div.reminderError .errorHead { + display: flex; + flex-direction: row; +} + +div.reminderError .errorIcon { + padding: 8px; + border-radius: 4px; + margin-right: 12px; +} + +div.reminderError .errorIcon .fas { + display: none +} + +div.reminderError[data-case="deleted"] .errorIcon { + background-color: #e7e5e4; +} + +div.reminderError[data-case="failed"] .errorIcon { + background-color: #fecaca; +} + +div.reminderError[data-case="sent"] .errorIcon { + background-color: #d9f99d; +} + +div.reminderError[data-case="deleted"] .errorIcon .fas.fa-trash { + display: block; +} + +div.reminderError[data-case="failed"] .errorIcon .fas.fa-exclamation-triangle { + display: block; +} + +div.reminderError[data-case="sent"] .errorIcon .fas.fa-check { + display: block; +} + +div.reminderError .errorHead .reminderName { + font-size: 1rem; + display: flex; + flex-direction: column; + justify-content: center; + color: rgb(54, 54, 54); + flex-grow: 1; +} + +div.reminderError .errorHead .reminderTime { + font-size: 1rem; + display: flex; + flex-direction: column; + flex-shrink: 1; + justify-content: center; + color: rgb(54, 54, 54); + background-color: #ffffff; + padding: 8px; + border-radius: 4px; + border-color: #e5e5e5; + border-width: 1px; + border-style: solid; +} + /* other stuff */ .half-rem { @@ -716,6 +795,18 @@ a.switch-pane { text-overflow: ellipsis; } +.guild-submenu { + display: none; +} + +.guild-submenu li { + font-size: 0.8rem; +} + +a.switch-pane.is-active ~ .guild-submenu { + display: block; +} + .feedback { background-color: #5865F2; } diff --git a/web/static/js/main.js b/web/static/js/main.js index b79ce7d..9aec630 100644 --- a/web/static/js/main.js +++ b/web/static/js/main.js @@ -18,6 +18,7 @@ const $downloader = document.querySelector("a#downloader"); const $uploader = document.querySelector("input#uploader"); let channels = []; +let reminderErrors = []; let guildNames = {}; let roles = []; let templates = {}; @@ -33,7 +34,11 @@ let globalPatreon = false; let guildPatreon = false; function guildId() { - return document.querySelector(".guildList a.is-active").dataset["guild"]; + return document.querySelector("li > a.is-active").parentElement.dataset["guild"]; +} + +function guildName() { + return guildNames[guildId()]; } function colorToInt(r, g, b) { @@ -52,7 +57,7 @@ function switch_pane(selector) { el.classList.add("is-hidden"); }); - document.getElementById(selector).classList.remove("is-hidden"); + document.querySelector(`*[data-name=${selector}]`).classList.remove("is-hidden"); } function update_select(sel) { @@ -449,21 +454,19 @@ document.addEventListener("guildSwitched", async (e) => { .querySelectorAll(".patreon-only") .forEach((el) => el.classList.add("is-locked")); - let $anchor = document.querySelector( - `.switch-pane[data-guild="${e.detail.guild_id}"]` - ); + let $li = document.querySelector(`li[data-guild="${e.detail.guild_id}"]`); - let hasError = false; - - if ($anchor === null) { + if ($li === null) { switch_pane("user-error"); - hasError = true; return; } - switch_pane($anchor.dataset["pane"]); + switch_pane(e.detail.pane); reset_guild_pane(); - $anchor.classList.add("is-active"); + $li.querySelector("li > a").classList.add("is-active"); + $li.querySelectorAll(`*[data-pane="${e.detail.pane}"]`).forEach((el) => { + el.classList.add("is-active"); + }); if (globalPatreon || (await fetch_patreon(e.detail.guild_id))) { document @@ -471,15 +474,26 @@ document.addEventListener("guildSwitched", async (e) => { .forEach((el) => el.classList.remove("is-locked")); } - hasError = await fetch_channels(e.detail.guild_id); + const event = new CustomEvent("paneLoad", { + detail: { + guild_id: e.detail.guild_id, + pane: e.detail.pane, + }, + }); + document.dispatchEvent(event); +}); + +document.addEventListener("paneLoad", async (ev) => { + const hasError = await fetch_channels(ev.detail.guild_id); if (!hasError) { - fetch_roles(e.detail.guild_id); - fetch_templates(e.detail.guild_id); - fetch_reminders(e.detail.guild_id); + fetch_roles(ev.detail.guild_id); + fetch_templates(ev.detail.guild_id); + fetch_reminders(ev.detail.guild_id); document.querySelectorAll("p.pageTitle").forEach((el) => { - el.textContent = `${e.detail.guild_name} Reminders`; + el.textContent = `${guildName()} Reminders`; }); + document.querySelectorAll("select.channel-selector").forEach((el) => { el.addEventListener("change", (e) => { update_select(e.target); @@ -684,36 +698,56 @@ document.addEventListener("DOMContentLoaded", async () => { "%guildname%", guild.name ); - $anchor.dataset["guild"] = guild.id; $anchor.dataset["name"] = guild.name; - $anchor.href = `/dashboard/${guild.id}?name=${guild.name}`; + $anchor.href = `/dashboard/${guild.id}/reminders`; - $anchor.addEventListener("click", async (e) => { - e.preventDefault(); - window.history.pushState({}, "", `/dashboard/${guild.id}`); - const event = new CustomEvent("guildSwitched", { - detail: { - guild_name: guild.name, - guild_id: guild.id, - }, + const $li = $anchor.parentElement; + $li.dataset["guild"] = guild.id; + + $li.querySelectorAll("a").forEach((el) => { + el.addEventListener("click", (e) => { + const pane = el.dataset["pane"]; + const slug = el.dataset["slug"]; + + if (pane !== undefined && slug !== undefined) { + e.preventDefault(); + + switch_pane(pane); + + window.history.pushState( + {}, + "", + `/dashboard/${guild.id}/${slug}` + ); + const event = new CustomEvent("guildSwitched", { + detail: { + guild_id: guild.id, + pane, + }, + }); + + document.dispatchEvent(event); + } }); - - document.dispatchEvent(event); }); element.append($clone); }); } - const matches = window.location.href.match(/dashboard\/(\d+)/); + const matches = window.location.href.match( + /dashboard\/(\d+)(\/)?([a-zA-Z\-]+)?/ + ); if (matches) { let id = matches[1]; + let kind = matches[3]; let name = guildNames[id]; const event = new CustomEvent("guildSwitched", { detail: { guild_name: name, guild_id: id, + pane: kind, }, }); diff --git a/web/static/js/reminder_errors.js b/web/static/js/reminder_errors.js new file mode 100644 index 0000000..181cf83 --- /dev/null +++ b/web/static/js/reminder_errors.js @@ -0,0 +1,43 @@ +function loadErrors() { + return fetch( + `/dashboard/api/guild/${guildId()}/reminders?status=deleted,sent,failed` + ).then((response) => response.json()); +} + +document.addEventListener("paneLoad", (ev) => { + if (ev.detail.pane !== "errors") { + return; + } + + document.querySelectorAll(".reminderError").forEach((el) => el.remove()); + + const template = document.getElementById("reminderError"); + const container = document.getElementById("reminderLog"); + + loadErrors() + .then((res) => { + res = res + .filter((r) => r.status_change_time !== null) + .sort((a, b) => a.status_change_time < b.status_change_time); + + for (const reminder of res) { + const newRow = template.content.cloneNode(true); + + newRow.querySelector(".reminderError").dataset["case"] = reminder.status; + + const statusTime = new luxon.DateTime.fromISO( + reminder.status_change_time, + { zone: "UTC" } + ); + newRow.querySelector(".reminderName").textContent = reminder.name; + newRow.querySelector(".reminderTime").textContent = statusTime + .toLocal() + .toLocaleString(luxon.DateTime.DATETIME_MED); + + container.appendChild(newRow); + } + }) + .finally(() => { + $loader.classList.add("is-hidden"); + }); +}); diff --git a/web/static/js/reminder_errors.ts b/web/static/js/reminder_errors.ts deleted file mode 100644 index 6fa4798..0000000 --- a/web/static/js/reminder_errors.ts +++ /dev/null @@ -1,19 +0,0 @@ -let _reminderErrors = []; - -const reminderErrors = () => { - return _reminderErrors; -} - -const guildId = () => { - let selected: HTMLElement = document.querySelector(".guildList a.is-active"); - return selected.dataset["guild"]; -} - - -function loadErrors() { - fetch(`/dashboard/api/guild/${guildId()}/errors`).then(response => response.json()) -} - -document.addEventListener('DOMContentLoaded', () => { - -}) diff --git a/web/templates/dashboard.html.tera b/web/templates/dashboard.html.tera index c84b5dc..1e12718 100644 --- a/web/templates/dashboard.html.tera +++ b/web/templates/dashboard.html.tera @@ -332,16 +332,16 @@

Press the to get started

-