Store guild when creating reminders

Stub code for routes. Update existing routes to set the reminder's guild
ID.

Cargo.toml

@@ -1,18 +1,18 @@
 [package]
 name = "reminder-rs"
-version = "1.6.40"
+version = "1.6.36"
 authors = ["Jude Southworth <judesouthworth@pm.me>"]
 edition = "2021"
 license = "AGPL-3.0 only"
 description = "Reminder Bot for Discord, now in Rust"
 
 [dependencies]
-poise = "0.5"
+poise = "0.5.5"
 dotenv = "0.15"
 tokio = { version = "1", features = ["process", "full"] }
 reqwest = "0.11"
-lazy-regex = "3.0"
+lazy-regex = "2.3.0"
-regex = "1.9"
+regex = "1.6"
 log = "0.4"
 env_logger = "0.10"
 chrono = "0.4"
@@ -25,7 +25,7 @@ serde_repr = "0.1"
 rmp-serde = "1.1"
 rand = "0.8"
 levenshtein = "1.0"
-sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal", "chrono", "migrate"]}
+sqlx = { version = "0.6", features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal", "chrono", "migrate"]}
 base64 = "0.21.0"
 
 [dependencies.postman]

migrations/20230903131153_reminder_status_timing.sql

@@ -1,4 +0,0 @@
-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` WHERE `status` != 'pending';

postman/Cargo.toml

@@ -5,12 +5,12 @@ edition = "2021"
 
 [dependencies]
 tokio = { version = "1", features = ["process", "full"] }
-regex = "1.9"
+regex = "1.4"
 log = "0.4"
 chrono = "0.4"
-chrono-tz = { version = "0.8", features = ["serde"] }
+chrono-tz = { version = "0.5", features = ["serde"] }
 lazy_static = "1.4"
 num-integer = "0.1"
 serde = "1.0"
-sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal", "chrono", "json"]}
+sqlx = { version = "0.6", features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal", "chrono", "json"]}
-serenity = { version = "0.11", default-features = false, features = ["builder", "cache", "client", "gateway", "http", "model", "utils", "rustls_backend"] }
+serenity = { version = "0.11.1", default-features = false, features = ["builder", "cache", "client", "gateway", "http", "model", "utils", "rustls_backend"] }

postman/src/sender.rs

@@ -237,11 +237,11 @@ impl Into<CreateEmbed> for Embed {
 pub struct Reminder {
     id: u32,
 
-    channel_id: Option<u64>,
+    channel_id: u64,
     webhook_id: Option<u64>,
     webhook_token: Option<String>,
 
-    channel_paused: Option<bool>,
+    channel_paused: bool,
     channel_paused_until: Option<NaiveDateTime>,
     enabled: bool,
 
@@ -297,7 +297,7 @@ SELECT
     reminders.`username` AS username
 FROM
     reminders
-LEFT JOIN
+INNER JOIN
     channels
 ON
     reminders.channel_id = channels.id
@@ -343,10 +343,7 @@ WHERE
 
     async fn reset_webhook(&self, pool: impl Executor<'_, Database = Database> + Copy) {
         let _ = sqlx::query!(
-            "
+            "UPDATE channels SET webhook_id = NULL, webhook_token = NULL WHERE channel = ?",
-            UPDATE channels SET webhook_id = NULL, webhook_token = NULL
-            WHERE channel = ?
-            ",
             self.channel_id
         )
         .execute(pool)
@@ -418,9 +415,7 @@ WHERE
                 self.set_sent(pool).await;
             } else {
                 sqlx::query!(
-                    "
+                    "UPDATE reminders SET `utc_time` = ? WHERE `id` = ?",
-                    UPDATE reminders SET `utc_time` = ? WHERE `id` = ?
-                    ",
                     updated_reminder_time.with_timezone(&Utc),
                     self.id
                 )
@@ -453,10 +448,7 @@ WHERE
 
         if *LOG_TO_DATABASE {
             sqlx::query!(
-                "
+                "INSERT INTO stat (type, reminder_id, message) VALUES ('reminder_failed', ?, ?)",
-                INSERT INTO stat (type, reminder_id, message)
-                VALUES ('reminder_failed', ?, ?)
-                ",
                 self.id,
                 message,
             )
@@ -469,10 +461,7 @@ WHERE
     async fn log_success(&self, pool: impl Executor<'_, Database = Database> + Copy) {
         if *LOG_TO_DATABASE {
             sqlx::query!(
-                "
+                "INSERT INTO stat (type, reminder_id) VALUES ('reminder_sent', ?)",
-                INSERT INTO stat (type, reminder_id)
-                VALUES ('reminder_sent', ?)
-                ",
                 self.id,
             )
             .execute(pool)
@@ -482,14 +471,7 @@ WHERE
     }
 
     async fn set_sent(&self, pool: impl Executor<'_, Database = Database> + Copy) {
-        sqlx::query!(
+        sqlx::query!("UPDATE reminders SET `status` = 'sent' WHERE `id` = ?", self.id)
-            "
-            UPDATE reminders
-            SET `status` = 'sent', `status_change_time` = NOW()
-            WHERE `id` = ?
-            ",
-            self.id
-        )
             .execute(pool)
             .await
             .expect(&format!("Could not delete Reminder {}", self.id));
@@ -501,11 +483,7 @@ WHERE
         message: &'static str,
     ) {
         sqlx::query!(
-            "
+            "UPDATE reminders SET `status` = 'failed', `status_message` = ? WHERE `id` = ?",
-            UPDATE reminders
-            SET `status` = 'failed', `status_message` = ?, `status_change_time` = NOW()
-            WHERE `id` = ?
-            ",
             message,
             self.id
         )
@@ -515,9 +493,7 @@ WHERE
     }
 
     async fn pin_message<M: Into<u64>>(&self, message_id: M, http: impl AsRef<Http>) {
-        if let Some(channel_id) = self.channel_id {
+        let _ = http.as_ref().pin_message(self.channel_id, message_id.into(), None).await;
-            let _ = http.as_ref().pin_message(channel_id, message_id.into(), None).await;
-        }
     }
 
     pub async fn send(
@@ -527,11 +503,10 @@ WHERE
     ) {
         async fn send_to_channel(
             cache_http: impl CacheHttp,
-            channel_id: u64,
             reminder: &Reminder,
             embed: Option<CreateEmbed>,
         ) -> Result<()> {
-            let channel = ChannelId(channel_id).to_channel(&cache_http).await;
+            let channel = ChannelId(reminder.channel_id).to_channel(&cache_http).await;
 
             match channel {
                 Ok(Channel::Guild(channel)) => {
@@ -563,7 +538,6 @@ WHERE
                         Err(e) => Err(e),
                     }
                 }
-
                 Ok(Channel::Private(channel)) => {
                     match channel
                         .send_message(&cache_http.http(), |m| {
@@ -593,9 +567,7 @@ WHERE
                         Err(e) => Err(e),
                     }
                 }
-
                 Err(e) => Err(e),
-
                 _ => Err(Error::Other("Channel not of valid type")),
             }
         }
@@ -650,20 +622,14 @@ WHERE
             }
         }
 
-        match self.channel_id {
-            Some(channel_id) => {
         if self.enabled
-                    && !(self.channel_paused.unwrap_or(false)
+            && !(self.channel_paused
                 && self
                     .channel_paused_until
                     .map_or(true, |inner| inner >= Utc::now().naive_local()))
         {
             let _ = sqlx::query!(
-                        "
+                "UPDATE `channels` SET paused = 0, paused_until = NULL WHERE `channel` = ?",
-                        UPDATE `channels`
-                        SET paused = 0, paused_until = NULL
-                        WHERE `channel` = ?
-                        ",
                 self.channel_id
             )
             .execute(pool)
@@ -674,10 +640,8 @@ WHERE
             let result = if let (Some(webhook_id), Some(webhook_token)) =
                 (self.webhook_id, &self.webhook_token)
             {
-                        let webhook_res = cache_http
+                let webhook_res =
-                            .http()
+                    cache_http.http().get_webhook_with_token(webhook_id, webhook_token).await;
-                            .get_webhook_with_token(webhook_id, webhook_token)
-                            .await;
 
                 if let Ok(webhook) = webhook_res {
                     send_to_webhook(cache_http, &self, webhook, embed).await
@@ -685,10 +649,10 @@ WHERE
                     warn!("Webhook vanished for reminder {}: {:?}", self.id, webhook_res);
 
                     self.reset_webhook(pool).await;
-                            send_to_channel(cache_http, channel_id, &self, embed).await
+                    send_to_channel(cache_http, &self, embed).await
                 }
             } else {
-                        send_to_channel(cache_http, channel_id, &self, embed).await
+                send_to_channel(cache_http, &self, embed).await
             };
 
             if let Err(e) = result {
@@ -715,10 +679,7 @@ WHERE
                                     None::<&'static str>,
                                 )
                                 .await;
-                                        self.set_failed(
+                                self.set_failed(pool, "Could not be sent as guild does not exist")
-                                            pool,
-                                            "Could not be sent as guild does not exist",
-                                        )
                                     .await;
                             }
                             50001 => {
@@ -728,11 +689,7 @@ WHERE
                                     None::<&'static str>,
                                 )
                                 .await;
-                                        self.set_failed(
+                                self.set_failed(pool, "Could not be sent as missing access").await;
-                                            pool,
-                                            "Could not be sent as missing access",
-                                        )
-                                        .await;
                             }
                             50007 => {
                                 self.log_error(
@@ -741,10 +698,7 @@ WHERE
                                     None::<&'static str>,
                                 )
                                 .await;
-                                        self.set_failed(
+                                self.set_failed(pool, "Could not be sent as user has DMs disabled")
-                                            pool,
-                                            "Could not be sent as user has DMs disabled",
-                                        )
                                     .await;
                             }
                             50013 => {
@@ -788,13 +742,4 @@ WHERE
             self.refresh(pool).await;
         }
     }
-
-            None => {
-                info!("Reminder {} is orphaned", self.id);
-
-                self.log_error(pool, "Orphaned", Option::<u8>::None).await;
-                self.set_failed(pool, "Could not be sent as channel was deleted").await;
-            }
-        }
-    }
 }

src/commands/command_macro/migrate.rs

@@ -27,7 +27,7 @@ pub async fn migrate_macro(ctx: Context<'_>) -> Result<(), Error> {
         "SELECT name, command FROM command_aliases WHERE guild_id = (SELECT id FROM guilds WHERE guild = ?)",
         guild_id.0
     )
-    .fetch_all(&mut *transaction)
+    .fetch_all(&mut transaction)
     .await?;
 
     let mut added_aliases = 0;
@@ -42,7 +42,7 @@ pub async fn migrate_macro(ctx: Context<'_>) -> Result<(), Error> {
                     cmd_macro.description,
                     cmd_macro.commands
                 )
-                .execute(&mut *transaction)
+                .execute(&mut transaction)
                 .await?;
 
                 added_aliases += 1;

src/component_models/mod.rs

@@ -166,21 +166,15 @@ impl ComponentDataModel {
                     .await;
             }
             ComponentDataModel::DelSelector(selector) => {
-                for id in &component.data.values {
+                let selected_id = component.data.values.join(",");
-                    match id.parse::<u32>() {
-                        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");
-                            }
-                        }
 
-                        Err(e) => {
+                sqlx::query!(
-                            warn!("Error casting ID to integer: {:?}.", e);
+                    "UPDATE reminders SET `status` = 'pending' WHERE FIND_IN_SET(id, ?)",
-                        }
+                    selected_id
-                    }
+                )
-                }
+                .execute(&data.database)
+                .await
+                .unwrap();
 
                 let reminders = Reminder::from_guild(
                     &ctx,

src/models/channel_data.rs

@@ -23,11 +23,7 @@ impl ChannelData {
 
         if let Ok(c) = sqlx::query_as_unchecked!(
             Self,
-            "
+            "SELECT id, name, nudge, blacklisted, webhook_id, webhook_token, paused, paused_until, guild_id AS db_guild_id 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)
@@ -35,18 +31,12 @@ impl ChannelData {
         {
             Ok(c)
         } else {
-            let props =
+            let props = channel.to_owned().guild().map(|g| (g.guild_id.as_u64().to_owned(), g.name));
-                channel.to_owned().guild().map(|g| (g.guild_id.as_u64().to_owned(), g.name));
 
-            let (guild_id, channel_name) =
+            let (guild_id, channel_name) = if let Some((a, b)) = props { (Some(a), Some(b)) } else { (None, None) };
-                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
@@ -57,10 +47,7 @@ impl ChannelData {
             Ok(sqlx::query_as_unchecked!(
                 Self,
                 "
-                SELECT id, name, nudge, blacklisted, webhook_id, webhook_token, paused,
+SELECT id, name, nudge, blacklisted, webhook_id, webhook_token, paused, paused_until, guild_id AS db_guild_id FROM channels WHERE channel = ?
-                    paused_until, guild_id AS db_guild_id
-                FROM channels
-                WHERE channel = ?
                 ",
                 channel_id
             )
@@ -72,10 +59,8 @@ impl ChannelData {
     pub async fn commit_changes(&self, pool: &MySqlPool) {
         sqlx::query!(
             "
-            UPDATE channels
+UPDATE channels SET name = ?, nudge = ?, blacklisted = ?, webhook_id = ?, webhook_token = ?, paused = ?, paused_until \
-            SET name = ?, nudge = ?, blacklisted = ?, webhook_id = ?, webhook_token = ?,
+             = ? WHERE id = ?
-                paused = ?, paused_until = ?
-            WHERE id = ?
             ",
             self.name,
             self.nudge,

src/models/reminder/mod.rs

@@ -304,10 +304,7 @@ WHERE
         &self,
         db: impl Executor<'_, Database = Database>,
     ) -> Result<(), sqlx::Error> {
-        sqlx::query!(
+        sqlx::query!("UPDATE reminders SET `status` = 'deleted' WHERE uid = ?", self.uid)
-            "UPDATE reminders SET `status` = 'deleted', `status_change_time` = NOW() WHERE uid = ?",
-            self.uid
-        )
             .execute(db)
             .await
             .map(|_| ())

web/Cargo.toml

@@ -7,14 +7,14 @@ edition = "2018"
 [dependencies]
 rocket = { git = "https://github.com/SergioBenitez/Rocket", branch = "master", features = ["tls", "secrets", "json"] }
 rocket_dyn_templates = { git = "https://github.com/SergioBenitez/Rocket", branch = "master", features = ["tera"] }
-serenity = { version = "0.11", default-features = false, features = ["builder", "cache", "client", "gateway", "http", "model", "utils", "rustls_backend"] }
+serenity = { version = "0.11.1", default-features = false, features = ["builder", "cache", "client", "gateway", "http", "model", "utils", "rustls_backend"] }
 oauth2 = "4"
 log = "0.4"
 reqwest = "0.11"
 serde = { version = "1.0", features = ["derive"] }
-sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "macros", "mysql", "chrono", "json"] }
+sqlx = { version = "0.6", features = ["runtime-tokio-rustls", "macros", "mysql", "chrono", "json"] }
 chrono = "0.4"
-chrono-tz = "0.8"
+chrono-tz = "0.5"
 lazy_static = "1.4.0"
 rand = "0.7"
 base64 = "0.13"

web/src/lib.rs

@@ -72,14 +72,10 @@ pub async fn initialize(
     db_pool: Pool<Database>,
 ) -> Result<(), Box<dyn std::error::Error>> {
     info!("Checking environment variables...");
-
-    if env::var("OFFLINE").map_or(true, |v| v != "1") {
     env::var("OAUTH2_CLIENT_ID").expect("`OAUTH2_CLIENT_ID' not supplied");
     env::var("OAUTH2_CLIENT_SECRET").expect("`OAUTH2_CLIENT_SECRET' not supplied");
     env::var("OAUTH2_DISCORD_CALLBACK").expect("`OAUTH2_DISCORD_CALLBACK' not supplied");
     env::var("PATREON_GUILD_ID").expect("`PATREON_GUILD_ID' not supplied");
-    }
-
     info!("Done!");
 
     let oauth2_client = BasicClient::new(
@@ -150,8 +146,7 @@ pub async fn initialize(
         .mount(
             "/dashboard",
             routes![
-                routes::dashboard::dashboard_1,
+                routes::dashboard::dashboard,
-                routes::dashboard::dashboard_2,
                 routes::dashboard::dashboard_home,
                 routes::dashboard::user::get_user_info,
                 routes::dashboard::user::update_user_info,
@@ -166,6 +161,7 @@ pub async fn initialize(
                 routes::dashboard::guild::get_reminders,
                 routes::dashboard::guild::edit_reminder,
                 routes::dashboard::guild::delete_reminder,
+                routes::dashboard::guild::get_reminder_errors,
                 routes::dashboard::export::export_reminders,
                 routes::dashboard::export::export_reminder_templates,
                 routes::dashboard::export::export_todos,
@@ -190,8 +186,6 @@ pub async fn initialize(
 }
 
 pub async fn check_subscription(cache_http: impl CacheHttp, user_id: impl Into<UserId>) -> bool {
-    offline!(true);
-
     if let Some(subscription_guild) = *CNC_GUILD {
         let guild_member = GuildId(subscription_guild).member(cache_http, user_id).await;
 
@@ -213,8 +207,6 @@ pub async fn check_guild_subscription(
     cache_http: impl CacheHttp,
     guild_id: impl Into<GuildId>,
 ) -> bool {
-    offline!(true);
-
     if let Some(guild) = cache_http.cache().unwrap().guild(guild_id) {
         let owner = guild.owner_id;
 

web/src/macros.rs

@@ -1,11 +1,3 @@
-macro_rules! offline {
-    ($field:expr) => {
-        if std::env::var("OFFLINE").map_or(false, |v| v == "1") {
-            return $field;
-        }
-    };
-}
-
 macro_rules! check_length {
     ($max:ident, $field:expr) => {
         if $field.len() > $max {
@@ -60,7 +52,6 @@ macro_rules! check_authorization {
 
         let user_id = $cookies.get_private("userid").map(|c| c.value().parse::<u64>().ok()).flatten();
 
-        if std::env::var("OFFLINE").map_or(true, |v| v != "1") {
         match user_id {
             Some(user_id) => {
                 match GuildId($guild).to_guild_cached($ctx) {
@@ -101,7 +92,6 @@ macro_rules! check_authorization {
             }
         }
     }
-    }
 }
 
 macro_rules! update_field {

web/src/routes/dashboard/export.rs

@@ -12,7 +12,8 @@ use sqlx::{MySql, Pool};
 
 use crate::routes::{
     dashboard::{
-        create_reminder, ImportBody, ReminderCreate, ReminderCsv, ReminderTemplateCsv, TodoCsv,
+        create_reminder, generate_uid, ImportBody, Reminder, ReminderCsv, ReminderTemplateCsv,
+        TodoCsv,
     },
     JsonResult,
 };
@@ -140,7 +141,7 @@ pub async fn import_reminders(
 
                         match channel_id.parse::<u64>() {
                             Ok(channel_id) => {
-                                let reminder = ReminderCreate {
+                                let reminder = Reminder {
                                     attachment: record.attachment,
                                     attachment_name: record.attachment_name,
                                     avatar: record.avatar,
@@ -167,6 +168,7 @@ pub async fn import_reminders(
                                     name: record.name,
                                     restartable: record.restartable,
                                     tts: record.tts,
+                                    uid: generate_uid(),
                                     username: record.username,
                                     utc_time: record.utc_time,
                                 };

web/src/routes/dashboard/guild.rs

@@ -26,7 +26,7 @@ use crate::{
     routes::{
         dashboard::{
             create_database_channel, create_reminder, template_name_default, DeleteReminder,
-            DeleteReminderTemplate, PatchReminder, Reminder, ReminderCreate, ReminderTemplate,
+            DeleteReminderTemplate, PatchReminder, Reminder, ReminderError, ReminderTemplate,
         },
         JsonResult,
     },
@@ -46,7 +46,6 @@ pub async fn get_guild_patreon(
     cookies: &CookieJar<'_>,
     ctx: &State<Context>,
 ) -> JsonResult {
-    offline!(Ok(json!({ "patreon": true })));
     check_authorization!(cookies, ctx.inner(), id);
 
     match GuildId(id).to_guild_cached(ctx.inner()) {
@@ -74,12 +73,6 @@ pub async fn get_guild_channels(
     cookies: &CookieJar<'_>,
     ctx: &State<Context>,
 ) -> JsonResult {
-    offline!(Ok(json!(vec![ChannelInfo {
-        name: "general".to_string(),
-        id: "1".to_string(),
-        webhook_avatar: None,
-        webhook_name: None,
-    }])));
     check_authorization!(cookies, ctx.inner(), id);
 
     match GuildId(id).to_guild_cached(ctx.inner()) {
@@ -118,7 +111,6 @@ struct RoleInfo {
 
 #[get("/api/guild/<id>/roles")]
 pub async fn get_guild_roles(id: u64, cookies: &CookieJar<'_>, ctx: &State<Context>) -> JsonResult {
-    offline!(Ok(json!(vec![RoleInfo { name: "@everyone".to_string(), id: "1".to_string() }])));
     check_authorization!(cookies, ctx.inner(), id);
 
     let roles_res = ctx.cache.guild_roles(id);
@@ -298,7 +290,7 @@ pub async fn delete_reminder_template(
 #[post("/api/guild/<id>/reminders", data = "<reminder>")]
 pub async fn create_guild_reminder(
     id: u64,
-    reminder: Json<ReminderCreate>,
+    reminder: Json<Reminder>,
     cookies: &CookieJar<'_>,
     serenity_context: &State<Context>,
     pool: &State<Pool<MySql>>,
@@ -318,22 +310,18 @@ pub async fn create_guild_reminder(
     .await
 }
 
-#[get("/api/guild/<id>/reminders?<status>")]
+#[get("/api/guild/<id>/reminders")]
 pub async fn get_reminders(
     id: u64,
     cookies: &CookieJar<'_>,
     serenity_context: &State<Context>,
     pool: &State<Pool<MySql>>,
-    status: Option<String>,
 ) -> JsonResult {
     check_authorization!(cookies, serenity_context.inner(), id);
 
-    let status = status.unwrap_or("pending".to_string());
-
     sqlx::query_as_unchecked!(
         Reminder,
-        "
+        "SELECT
-        SELECT
          reminders.attachment,
          reminders.attachment_name,
          reminders.avatar,
@@ -359,14 +347,10 @@ pub async fn get_reminders(
          reminders.tts,
          reminders.uid,
          reminders.username,
-         reminders.utc_time,
+         reminders.utc_time
-         reminders.status,
-         reminders.status_change_time,
-         reminders.status_message
         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 = ?)",
+        WHERE `status` = 'pending' AND reminders.guild_id = (SELECT id FROM guilds WHERE guild = ?)",
-        status,
         id
     )
     .fetch_all(pool.inner())
@@ -550,8 +534,7 @@ pub async fn edit_reminder(
 
     match sqlx::query_as_unchecked!(
         Reminder,
-        "
+        "SELECT reminders.attachment,
-        SELECT reminders.attachment,
          reminders.attachment_name,
          reminders.avatar,
          channels.channel,
@@ -576,10 +559,7 @@ pub async fn edit_reminder(
          reminders.tts,
          reminders.uid,
          reminders.username,
-         reminders.utc_time,
+         reminders.utc_time
-         reminders.status,
-         reminders.status_change_time,
-         reminders.status_message
         FROM reminders
         LEFT JOIN channels ON channels.id = reminders.channel_id
         WHERE uid = ?",
@@ -603,10 +583,7 @@ pub async fn delete_reminder(
     reminder: Json<DeleteReminder>,
     pool: &State<Pool<MySql>>,
 ) -> JsonResult {
-    match sqlx::query!(
+    match sqlx::query!("UPDATE reminders SET `status` = 'deleted' WHERE uid = ?", reminder.uid)
-        "UPDATE reminders SET `status` = 'deleted', `status_change_time` = NOW() WHERE uid = ?",
-        reminder.uid
-    )
         .execute(pool.inner())
         .await
     {
@@ -619,3 +596,35 @@ pub async fn delete_reminder(
         }
     }
 }
+
+#[get("/api/guild/<id>/errors")]
+pub async fn get_reminder_errors(
+    id: u64,
+    cookies: &CookieJar<'_>,
+    serenity_context: &State<Context>,
+    pool: &State<Pool<MySql>>,
+) -> JsonResult {
+    check_authorization!(cookies, serenity_context.inner(), id);
+
+    sqlx::query_as_unchecked!(
+        ReminderError,
+        "SELECT
+         reminders.status,
+         reminders.utc_time,
+         reminders.name,
+         reminders.uid,
+         reminders.channel_id AS channel
+        FROM reminders
+        LEFT JOIN channels ON channels.id = reminders.channel_id
+        WHERE (`status` != 'pending' OR reminders.channel_id IS NULL) AND reminders.guild_id = (SELECT id FROM guilds WHERE guild = ?)",
+        id
+    )
+    .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")
+    })
+}

web/src/routes/dashboard/mod.rs

@@ -118,8 +118,8 @@ pub struct EmbedField {
     inline: bool,
 }
 
-#[derive(Deserialize)]
+#[derive(Serialize, Deserialize)]
-pub struct ReminderCreate {
+pub struct Reminder {
     #[serde(with = "base64s")]
     attachment: Option<Vec<u8>>,
     attachment_name: Option<String>,
@@ -146,45 +146,22 @@ pub struct ReminderCreate {
     name: String,
     restartable: bool,
     tts: bool,
-    username: Option<String>,
-    utc_time: NaiveDateTime,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Reminder {
-    #[serde(with = "base64s")]
-    attachment: Option<Vec<u8>>,
-    attachment_name: Option<String>,
-    avatar: Option<String>,
-    #[serde(with = "string_opt")]
-    channel: Option<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: Option<Json<Vec<EmbedField>>>,
-    enabled: bool,
-    expires: Option<NaiveDateTime>,
-    interval_seconds: Option<u32>,
-    interval_days: Option<u32>,
-    interval_months: Option<u32>,
-    #[serde(default = "name_default")]
-    name: String,
-    restartable: bool,
-    tts: bool,
     #[serde(default)]
     uid: String,
     username: Option<String>,
     utc_time: NaiveDateTime,
+}
+
+#[derive(Serialize)]
+pub struct ReminderError {
+    #[serde(with = "string")]
+    channel: u64,
     status: String,
-    status_message: Option<String>,
+    #[serde(default = "name_default")]
-    status_change_time: Option<NaiveDateTime>,
+    name: String,
+    #[serde(default)]
+    uid: String,
+    utc_time: NaiveDateTime,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -323,7 +300,15 @@ pub fn generate_uid() -> String {
 mod string {
     use std::{fmt::Display, str::FromStr};
 
-    use serde::{de, Deserialize, Deserializer};
+    use serde::{de, Deserialize, Deserializer, Serializer};
+
+    pub fn serialize<T, S>(value: &T, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        T: Display,
+        S: Serializer,
+    {
+        serializer.collect_str(value)
+    }
 
     pub fn deserialize<'de, T, D>(deserializer: D) -> Result<T, D::Error>
     where
@@ -335,34 +320,6 @@ mod string {
     }
 }
 
-mod string_opt {
-    use std::{fmt::Display, str::FromStr};
-
-    use serde::{de, Deserialize, Deserializer, Serializer};
-
-    pub fn serialize<T, S>(value: &Option<T>, serializer: S) -> Result<S::Ok, S::Error>
-    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<Option<T>, 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};
 
@@ -407,7 +364,7 @@ pub async fn create_reminder(
     pool: impl sqlx::Executor<'_, Database = Database> + Copy,
     guild_id: GuildId,
     user_id: UserId,
-    reminder: ReminderCreate,
+    reminder: Reminder,
 ) -> JsonResult {
     // check guild in db
     match sqlx::query!("SELECT 1 as A FROM guilds WHERE guild = ?", guild_id.0)
@@ -435,7 +392,7 @@ 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
         );
 
@@ -529,8 +486,7 @@ pub async fn create_reminder(
 
     // write to db
     match sqlx::query!(
-        "
+        "INSERT INTO reminders (
-        INSERT INTO reminders (
          uid,
          attachment,
          attachment_name,
@@ -558,9 +514,7 @@ pub async fn create_reminder(
          tts,
          username,
          `utc_time`
-        ) VALUES (?, ?, ?, ?,
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
-        (SELECT id FROM guilds WHERE guild = ?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
-        ?, ?, ?, ?, ?)",
         new_uid,
         attachment_data,
         reminder.attachment_name,
@@ -620,10 +574,7 @@ pub async fn create_reminder(
              reminders.tts,
              reminders.uid,
              reminders.username,
-             reminders.utc_time,
+             reminders.utc_time
-             reminders.status,
-             reminders.status_change_time,
-             reminders.status_message
             FROM reminders
             LEFT JOIN channels ON channels.id = reminders.channel_id
             WHERE uid = ?",
@@ -725,17 +676,7 @@ pub async fn dashboard_home(cookies: &CookieJar<'_>) -> Result<Template, Redirec
 }
 
 #[get("/<_>")]
-pub async fn dashboard_1(cookies: &CookieJar<'_>) -> Result<Template, Redirect> {
+pub async fn dashboard(cookies: &CookieJar<'_>) -> Result<Template, Redirect> {
-    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<Template, Redirect> {
     if cookies.get_private("userid").is_some() {
         let map: HashMap<&str, String> = HashMap::new();
         Ok(Template::render("dashboard", &map))

web/src/routes/dashboard/user.rs

@@ -54,8 +54,6 @@ pub async fn get_user_info(
     ctx: &State<Context>,
     pool: &State<Pool<MySql>>,
 ) -> JsonValue {
-    offline!(json!(UserInfo { name: "Discord".to_string(), patreon: true, timezone: None }));
-
     if let Some(user_id) =
         cookies.get_private("userid").map(|u| u.value().parse::<u64>().ok()).flatten()
     {
@@ -118,8 +116,6 @@ pub async fn update_user_info(
 
 #[get("/api/user/guilds")]
 pub async fn get_user_guilds(cookies: &CookieJar<'_>, reqwest_client: &State<Client>) -> JsonValue {
-    offline!(json!(vec![GuildInfo { id: "1".to_string(), name: "Guild".to_string() }]));
-
     if let Some(access_token) = cookies.get_private("access_token") {
         let request_res = reqwest_client
             .get(format!("{}/users/@me/guilds", DISCORD_API))

web/static/css/style.css

@@ -15,18 +15,6 @@ div.reminderContent.is-collapsed .column.settings {
     display: none;
 }
 
-div.reminderContent.is-collapsed .button-row {
-    display: none;
-}
-
-div.reminderContent.is-collapsed .button-row-edit {
-    display: none;
-}
-
-div.reminderContent.is-collapsed .reminder-topbar {
-    padding-bottom: 0;
-}
-
 div.reminderContent.is-collapsed .invert-collapses {
     display: inline-flex;
 }
@@ -141,12 +129,6 @@ div.split-controls {
     margin-top: 0 !important;
 }
 
-.reminder-settings > .column {
-    flex-grow: 0;
-    flex-shrink: 0;
-    flex-basis: 50%;
-}
-
 div.reminderContent {
     margin-top: 10px;
     margin-bottom: 10px;
@@ -267,11 +249,11 @@ div#pageNavbar a {
 
 .navbar-item.pageTitle {
     flex-shrink: 1;
-    white-space: nowrap;
+    text-wrap: nowrap;
     overflow: hidden;
 }
 
-.dashboard-burger, .dashboard-burger:active, .dashboard-burger.is-active {
+.navbar-burger, .navbar-burger:active, .navbar-burger.is-active {
     background-color: #adc99c !important;
     border-radius: 14px;
     padding: 6px;
@@ -309,19 +291,10 @@ div.dashboard-sidebar:not(.mobile-sidebar) {
     flex-direction: column;
 }
 
-ul.guildList {
-    flex-grow: 1;
-    flex-shrink: 1;
-    overflow: auto;
-}
-
 div.dashboard-sidebar:not(.mobile-sidebar) .aside-footer {
-    flex-shrink: 0;
+    position: fixed;
-    flex-grow: 0;
+    bottom: 0;
-}
+    width: 226px;
-
-div.dashboard-sidebar svg {
-    flex-shrink: 0;
 }
 
 div.mobile-sidebar {
@@ -471,7 +444,8 @@ input.default-width {
 .customizable.is-400x300 img {
     margin-top: 10px;
     width: 100%;
-    height: 100px;
+    min-height: 100px;
+    max-height: 400px;
 }
 
 .customizable.is-32x32 img {
@@ -615,14 +589,6 @@ input.default-width {
     border-bottom: 1px solid #fff;
 }
 
-.channel-selector {
-    width: 100%;
-}
-
-.select {
-    width: 100%;
-}
-
 li.highlight {
     margin-bottom: 0 !important;
 }
@@ -646,22 +612,7 @@ li.highlight {
     padding: 2px;
 }
 
-@media only screen and (max-width: 1023px) {
+@media only screen and (max-width: 1408px) {
-    p.title.pageTitle {
-        display: none;
-    }
-
-    .dashboard-frame {
-        margin-top: 4rem !important;
-    }
-
-    .customizable.thumbnail img {
-        width: 60px;
-        height: 60px;
-    }
-}
-
-@media only screen and (max-width: 768px) {
     .button-row {
         display: flex;
         flex-direction: column;
@@ -679,20 +630,41 @@ li.highlight {
     .button-row button {
         width: 100%;
     }
+}
 
-    .reminder-settings {
+@media only screen and (max-width: 768px) {
-        margin-bottom: 0 !important;
+    .button-row-edit {
+        display: flex;
+        flex-direction: column;
     }
 
-    .tts-row {
+    .button-row-edit > button {
-        padding-bottom: 0;
+        width: 100%;
+        margin: 4px;
+    }
+
+    p.title.pageTitle {
+        visibility: hidden;
+        text-wrap: nowrap;
+        overflow: hidden;
+    }
+}
+
+@media only screen and (max-width: 768px) {
+    .customizable.thumbnail img {
+        width: 60px;
+        height: 60px;
+    }
+
+    .customizable.is-24x24 img {
+        width: 16px;
+        height: 16px;
     }
 }
 
 /* loader */
 #loader {
     position: fixed;
-    top: 0;
     background-color: rgba(255, 255, 255, 0.8);
     width: 100vw;
     z-index: 999;
@@ -704,86 +676,6 @@ 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;
-}
-
-div.reminderError .reminderMessage {
-    font-size: 1rem;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    color: rgb(54, 54, 54);
-    flex-grow: 1;
-    font-style: italic;
-}
-
 /* other stuff */
 
 .half-rem {
@@ -821,38 +713,15 @@ 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;
 }
 
 .is-locked {
     pointer-events: none;
-}
-
-.is-locked > :not(.patreon-invert) {
     opacity: 0.4;
 }
 
-.is-locked .patreon-invert {
-    display: block;
-}
-
-.patreon-invert {
-    display: none;
-}
-
 .is-locked .foreground {
     pointer-events: auto;
 }
@@ -882,5 +751,5 @@ a.switch-pane.is-active ~ .guild-submenu {
 }
 
 .figure-num {
-    font-size: 2rem;
+    font-size: 2em;
 }

web/static/js/main.js

@@ -18,7 +18,6 @@ const $downloader = document.querySelector("a#downloader");
 const $uploader = document.querySelector("input#uploader");
 
 let channels = [];
-let reminderErrors = [];
 let guildNames = {};
 let roles = [];
 let templates = {};
@@ -34,11 +33,7 @@ let globalPatreon = false;
 let guildPatreon = false;
 
 function guildId() {
-    return document.querySelector("li > a.is-active").parentElement.dataset["guild"];
+    return document.querySelector(".guildList a.is-active").dataset["guild"];
-}
-
-function guildName() {
-    return guildNames[guildId()];
 }
 
 function colorToInt(r, g, b) {
@@ -57,7 +52,7 @@ function switch_pane(selector) {
         el.classList.add("is-hidden");
     });
 
-    document.querySelector(`*[data-name=${selector}]`).classList.remove("is-hidden");
+    document.getElementById(selector).classList.remove("is-hidden");
 }
 
 function update_select(sel) {
@@ -454,27 +449,21 @@ document.addEventListener("guildSwitched", async (e) => {
         .querySelectorAll(".patreon-only")
         .forEach((el) => el.classList.add("is-locked"));
 
-    let $li = document.querySelectorAll(`li[data-guild="${e.detail.guild_id}"]`);
+    let $anchor = document.querySelector(
+        `.switch-pane[data-guild="${e.detail.guild_id}"]`
+    );
 
-    if ($li.length === 0) {
+    let hasError = false;
+
+    if ($anchor === null) {
         switch_pane("user-error");
+        hasError = true;
         return;
     }
 
-    switch_pane(e.detail.pane);
+    switch_pane($anchor.dataset["pane"]);
     reset_guild_pane();
-    document
+    $anchor.classList.add("is-active");
-        .querySelectorAll(`li[data-guild="${e.detail.guild_id}"] > a`)
-        .forEach((el) => {
-            el.classList.add("is-active");
-        });
-    document
-        .querySelectorAll(
-            `li[data-guild="${e.detail.guild_id}"] *[data-pane="${e.detail.pane}"]`
-        )
-        .forEach((el) => {
-            el.classList.add("is-active");
-        });
 
     if (globalPatreon || (await fetch_patreon(e.detail.guild_id))) {
         document
@@ -482,26 +471,15 @@ document.addEventListener("guildSwitched", async (e) => {
             .forEach((el) => el.classList.remove("is-locked"));
     }
 
-    const event = new CustomEvent("paneLoad", {
+    hasError = await fetch_channels(e.detail.guild_id);
-        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(ev.detail.guild_id);
+        fetch_roles(e.detail.guild_id);
-        fetch_templates(ev.detail.guild_id);
+        fetch_templates(e.detail.guild_id);
-        fetch_reminders(ev.detail.guild_id);
+        fetch_reminders(e.detail.guild_id);
 
         document.querySelectorAll("p.pageTitle").forEach((el) => {
-            el.textContent = `${guildName()} Reminders`;
+            el.textContent = `${e.detail.guild_name} Reminders`;
         });
-
         document.querySelectorAll("select.channel-selector").forEach((el) => {
             el.addEventListener("change", (e) => {
                 update_select(e.target);
@@ -706,56 +684,36 @@ document.addEventListener("DOMContentLoaded", async () => {
                             "%guildname%",
                             guild.name
                         );
+                        $anchor.dataset["guild"] = guild.id;
                         $anchor.dataset["name"] = guild.name;
-                        $anchor.href = `/dashboard/${guild.id}/reminders`;
+                        $anchor.href = `/dashboard/${guild.id}?name=${guild.name}`;
 
-                        const $li = $anchor.parentElement;
+                        $anchor.addEventListener("click", async (e) => {
-                        $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();
-
+                            window.history.pushState({}, "", `/dashboard/${guild.id}`);
-                                    switch_pane(pane);
-
-                                    window.history.pushState(
-                                        {},
-                                        "",
-                                        `/dashboard/${guild.id}/${slug}`
-                                    );
                             const event = new CustomEvent("guildSwitched", {
                                 detail: {
+                                    guild_name: guild.name,
                                     guild_id: guild.id,
-                                            pane,
                                 },
                             });
 
                             document.dispatchEvent(event);
-                                }
-                            });
                         });
 
                         element.append($clone);
                     });
                 }
 
-                const matches = window.location.href.match(
+                const matches = window.location.href.match(/dashboard\/(\d+)/);
-                    /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,
                         },
                     });
 

web/static/js/reminder_errors.js

@@ -1,45 +1,19 @@
-function loadErrors() {
+let _reminderErrors = [];
-    return fetch(
+
-        `/dashboard/api/guild/${guildId()}/reminders?status=deleted,sent,failed`
+const reminderErrors = () => {
-    ).then((response) => response.json());
+    return _reminderErrors;
 }
 
-document.addEventListener("paneLoad", (ev) => {
+const guildId = () => {
-    if (ev.detail.pane !== "errors") {
+    let selected = document.querySelector(".guildList a.is-active");
-        return;
+    return selected.dataset["guild"];
-    }
+}
 
-    document.querySelectorAll(".reminderError").forEach((el) => el.remove());
 
-    const template = document.getElementById("reminderError");
+function loadErrors() {
-    const container = document.getElementById("reminderLog");
+    fetch(`/dashboard/api/guild/${guildId()}/errors`).then(response => response.json())
+}
 
-    loadErrors()
+document.addEventListener('DOMContentLoaded', () => {
-        .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(".reminderMessage").textContent =
-                    reminder.status_message;
-                newRow.querySelector(".reminderTime").textContent = statusTime
-                    .toLocal()
-                    .toLocaleString(luxon.DateTime.DATETIME_MED);
-
-                container.appendChild(newRow);
-            }
-        })
-        .finally(() => {
-            $loader.classList.add("is-hidden");
-        });
-});

web/templates/dashboard.html.tera

@@ -40,14 +40,14 @@
     <div class="navbar-brand">
         <a class="navbar-item" href="/">
             <figure class="image">
-                <img width="28px" height="28px" src="/static/img/logo_nobg.webp" alt="Reminder Bot Logo">
+                <img src="/static/img/logo_nobg.webp" alt="Reminder Bot Logo">
             </figure>
         </a>
 
         <p class="navbar-item pageTitle">
         </p>
 
-        <a role="button" class="dashboard-burger navbar-burger is-right" aria-label="menu" aria-expanded="false"
+        <a role="button" class="navbar-burger is-right" aria-label="menu" aria-expanded="false"
            data-target="mobileSidebar">
             <span aria-hidden="true"></span>
             <span aria-hidden="true"></span>
@@ -234,7 +234,6 @@
         <a href="/">
             <div class="brand">
                 <img src="/static/img/logo_nobg.webp" alt="Reminder bot logo"
-                     width="52px" height="52px"
                      class="dashboard-brand">
             </div>
         </a>
@@ -333,17 +332,37 @@
                 <p class="subtitle is-hidden-desktop">Press the <span class="icon"><i class="fal fa-bars"></i></span> to get started</p>
             </div>
         </section>
-        <section data-name="reminders" class="is-hidden">
+        <section id="guild" class="is-hidden">
             {% include "reminder_dashboard/reminder_dashboard" %}
         </section>
-        <section data-name="errors" class="is-hidden">
+        <section id="guild-error" class="is-hidden hero is-fullheight">
-            {% include "reminder_dashboard/reminder_errors" %}
+            <div class="hero-body">
+                <div class="container has-text-centered">
+                    <p class="title">
+                        We couldn't get this server's data
+                    </p>
+                    <p class="subtitle">
+                        Please check Reminder Bot is in the server, and has correct permissions.
+                    </p>
+                    <a class="button is-size-4 is-rounded is-success" href="https://invite.reminder-bot.com">
+                        <p class="is-size-4">
+                            <span>Add to Server</span> <span class="icon"><i class="fas fa-chevron-right"></i></span>
+                        </p>
+                    </a>
+                </div>
+            </div>
         </section>
-        <section data-name="guild-error" class="is-hidden">
+        <section id="user-error" class="is-hidden hero is-fullheight">
-            {% include "reminder_dashboard/guild_error" %}
+            <div class="hero-body">
-        </section>
+                <div class="container has-text-centered">
-        <section data-name="user-error" class="is-hidden">
+                    <p class="title">
-            {% include "reminder_dashboard/user_error" %}
+                        You do not have permissions for this server
+                    </p>
+                    <p class="subtitle">
+                        Ask an admin to grant you the "Manage Messages" permission.
+                    </p>
+                </div>
+            </div>
         </section>
     </div>
     <!-- /main content -->
@@ -376,28 +395,14 @@
 
 <template id="guildListEntry">
     <li>
-        <a class="switch-pane" data-pane="reminders" data-slug="reminders">
+        <a class="switch-pane" data-pane="guild">
             <span class="icon"><i class="fas fa-map-pin"></i></span> <span class="guild-name">%guildname%</span>
         </a>
-        <ul class="guild-submenu">
-            <li>
-                <a class="switch-pane" data-pane="reminders" data-slug="reminders">
-                    <span class="icon"><i class="fas fa-calendar-alt"></i></span> Reminders
-                </a>
-                <a class="switch-pane" data-pane="errors" data-slug="errors">
-                    <span class="icon"><i class="fas fa-file-alt"></i></span> Logs
-                </a>
-            </li>
-        </ul>
     </li>
 </template>
 
 <template id="guildReminder">
-    {% include "reminder_dashboard/templates/guild_reminder" %}
+    {% include "reminder_dashboard/guild_reminder" %}
-</template>
-
-<template id="reminderError">
-    {% include "reminder_dashboard/templates/reminder_error" %}
 </template>
 
 <script src="/static/js/iro.js"></script>

web/templates/reminder_dashboard/guild_error.html.tera

@@ -1,17 +0,0 @@
-<div class="hero is-fullheight">
-    <div class="hero-body">
-        <div class="container has-text-centered">
-            <p class="title">
-                We couldn't get this server's data
-            </p>
-            <p class="subtitle">
-                Please check Reminder Bot is in the server, and has correct permissions.
-            </p>
-            <a class="button is-size-4 is-rounded is-success" href="https://invite.reminder-bot.com">
-                <p class="is-size-4">
-                    <span>Add to Server</span> <span class="icon"><i class="fas fa-chevron-right"></i></span>
-                </p>
-            </a>
-        </div>
-    </div>
-</div>

web/templates/reminder_dashboard/guild_reminder.html.tera

@@ -133,6 +133,8 @@
             </article>
         </div>
         <div class="column settings">
+            <div class="columns">
+                <div class="column">
                     <div class="field channel-field">
                         <div class="collapses">
                             <label class="label" for="channelOption">Channel*</label>
@@ -147,7 +149,8 @@
                             </div>
                         </div>
                     </div>
-
+                </div>
+                <div class="column">
                     <div class="field">
                         <div class="control">
                             <label class="label collapses">
@@ -156,13 +159,12 @@
                             </label>
                         </div>
                     </div>
+                </div>
+            </div>
 
             <div class="collapses split-controls">
                 <div>
                     <div class="patreon-only">
-                        <div class="patreon-invert foreground">
-                            Intervals available on <a href="https://patreon.com/jellywx">Patreon</a> or <a href="https://gitea.jellypro.xyz/jude/reminder-bot">self-hosting</a>
-                        </div>
                         <div class="field">
                             <label class="label">Interval <a class="foreground" href="/help/intervals"><i class="fas fa-question-circle"></i></a></label>
                             <div class="control intervalSelector">
@@ -231,9 +233,7 @@
                         </div>
                     </div>
                 </div>
-            </div>
+
-        </div>
-    </div>
                 {% if creating %}
                     <div class="button-row">
                         <div class="button-row-reminder">
@@ -266,4 +266,7 @@
                         </button>
                     </div>
                 {% endif %}
+            </div>
+        </div>
+    </div>
 </div>

web/templates/reminder_dashboard/reminder_dashboard.html.tera

@@ -2,7 +2,7 @@
     <strong>Create Reminder</strong>
     <div id="reminderCreator">
         {% set creating = true %}
-        {% include "reminder_dashboard/templates/guild_reminder" %}
+        {% include "reminder_dashboard/guild_reminder" %}
         {% set creating = false %}
     </div>
     <br>
@@ -46,10 +46,6 @@
     <div id="guildReminders">
 
     </div>
-
-    <div id="guildErrors">
-
-    </div>
 </div>
 
 <script src="/static/js/sort.js"></script>

web/templates/reminder_dashboard/reminder_errors.html.tera

@@ -1,5 +0,0 @@
-<div id="reminderLog">
-
-</div>
-
-<script src="/static/js/reminder_errors.js"></script>

web/templates/reminder_dashboard/templates/reminder_error.html.tera

@@ -1,20 +0,0 @@
-<div class="reminderError" data-case="success">
-    <div class="errorHead">
-        <div class="errorIcon">
-            <span class="icon">
-                <i class="fas fa-trash"></i>
-                <i class="fas fa-check"></i>
-                <i class="fas fa-exclamation-triangle"></i>
-            </span>
-        </div>
-        <div class="reminderName">
-            Reminder
-        </div>
-        <div class="reminderMessage">
-
-        </div>
-        <div class="reminderTime">
-
-        </div>
-    </div>
-</div>

web/templates/reminder_dashboard/user_error.html.tera

@@ -1,12 +0,0 @@
-<div class="hero is-fullheight">
-    <div class="hero-body">
-        <div class="container has-text-centered">
-            <p class="title">
-                You do not have permissions for this server
-            </p>
-            <p class="subtitle">
-                Ask an admin to grant you the "Manage Messages" permission.
-            </p>
-        </div>
-    </div>
-</div>