Default channel command

Add length checks for name and description

Cargo.toml

@@ -1,29 +1,30 @@
 [package]
 name = "reminder_rs"
-version = "1.6.0-beta3"
+version = "1.6.6"
 authors = ["jellywx <judesouthworth@pm.me>"]
 edition = "2018"
 
 [dependencies]
-poise = "0.2"
+poise = "0.3"
 dotenv = "0.15"
 tokio = { version = "1", features = ["process", "full"] }
 reqwest = "0.11"
-regex = "1.4"
+lazy-regex = "2.3.0"
+regex = "1.6"
 log = "0.4"
-env_logger = "0.8"
+env_logger = "0.9"
 chrono = "0.4"
-chrono-tz = { version = "0.5", features = ["serde"] }
+chrono-tz = { version = "0.6", features = ["serde"] }
 lazy_static = "1.4"
 num-integer = "0.1"
 serde = "1.0"
 serde_json = "1.0"
 serde_repr = "0.1"
-rmp-serde = "0.15"
+rmp-serde = "1.1"
-rand = "0.7"
+rand = "0.8"
 levenshtein = "1.0"
-sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal", "chrono"]}
+sqlx = { version = "0.6", features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal", "chrono"]}
-base64 = "0.13.0"
+base64 = "0.13"
 
 [dependencies.postman]
 path = "postman"

README.md

@@ -2,13 +2,20 @@
 Reminder Bot for Discord.
 
 ## How do I use it?
-We offer a hosted version of the bot. You can invite it with: **https://invite.reminder-bot.com**. The catch is that repeating 
+I offer a hosted version of the bot. You can invite it with: **https://invite.reminder-bot.com**. The catch is that repeating 
 reminders are paid on the hosted version of the bot. Keep reading if you want to host it yourself.
 
 You'll need rustc and cargo for compilation. To run, you'll need Python 3 still (due to no suitable replacement for dateparser in Rust)
 
 ### Compiling
-Reminder Bot can be built by running `cargo build --release` in the top level directory. It is necessary to create a folder called 'assets' containing an image file with its name specified in the environment as `WEBHOOK_AVATAR`, of dimensions 128x128px to be used as the webhook avatar.
+Install build requirements: 
+`sudo apt install gcc gcc-multilib cmake libssl-dev build-essential`
+
+Install Rust from https://rustup.rs
+
+Reminder Bot can then be built by running `cargo build --release` in the top level directory. It is necessary to create a 
+folder called 'assets' containing an image file with its name specified in the environment as `WEBHOOK_AVATAR`, of 
+dimensions 128x128px to be used as the webhook avatar.
 
 #### Compilation environment variables
 These environment variables must be provided when compiling the bot

migration/01-reminder_message_embed.sql

@@ -157,4 +157,9 @@ CREATE TABLE events (
     FOREIGN KEY (reminder_id) REFERENCES reminders_new(id) ON DELETE SET NULL
 );
 
+DROP TABLE reminders;
+DROP TABLE embed_fields;
+RENAME TABLE reminders_new TO reminders;
+RENAME TABLE embed_fields_new TO embed_fields;
+
 SET FOREIGN_KEY_CHECKS = 1;

migration/04-reminder_templates.sql

@@ -32,3 +32,20 @@ CREATE TABLE reminder_template (
 );
 
 ALTER TABLE reminders ADD COLUMN embed_fields JSON;
+
+update reminders
+    inner join embed_fields as E
+    on E.reminder_id = reminders.id
+set embed_fields = (
+    select JSON_ARRAYAGG(
+        JSON_OBJECT(
+            'title', E.title,
+            'value', E.value,
+            'inline',
+            if(inline = 1, cast(TRUE as json), cast(FALSE as json))
+            )
+        )
+    from embed_fields
+    group by reminder_id
+    having reminder_id = reminders.id
+    );

migration/05-restructure-guild-table.sql

@@ -0,0 +1,92 @@
+SET foreign_key_checks = 0;
+
+START TRANSACTION;
+
+-- drop existing constraints
+ALTER TABLE channels DROP FOREIGN KEY `channels_ibfk_1`;
+ALTER TABLE command_aliases DROP FOREIGN KEY `command_aliases_ibfk_1`;
+ALTER TABLE events DROP FOREIGN KEY `events_ibfk_1`;
+ALTER TABLE guild_users DROP FOREIGN KEY `guild_users_ibfk_1`;
+ALTER TABLE macro DROP FOREIGN KEY `macro_ibfk_1`;
+ALTER TABLE roles DROP FOREIGN KEY `roles_ibfk_1`;
+ALTER TABLE todos DROP FOREIGN KEY `todos_ibfk_2`;
+ALTER TABLE reminder_template DROP FOREIGN KEY `reminder_template_ibfk_1`;
+
+-- update foreign key types
+ALTER TABLE channels MODIFY `guild_id` BIGINT UNSIGNED;
+ALTER TABLE command_aliases MODIFY `guild_id` BIGINT UNSIGNED;
+ALTER TABLE events MODIFY `guild_id` BIGINT UNSIGNED;
+ALTER TABLE guild_users MODIFY `guild` BIGINT UNSIGNED;
+ALTER TABLE macro MODIFY `guild_id` BIGINT UNSIGNED;
+ALTER TABLE roles MODIFY `guild_id` BIGINT UNSIGNED;
+ALTER TABLE todos MODIFY `guild_id` BIGINT UNSIGNED;
+ALTER TABLE reminder_template MODIFY `guild_id` BIGINT UNSIGNED;
+
+-- update foreign key values
+UPDATE channels SET `guild_id` = (SELECT `guild` FROM guilds WHERE guilds.`id` = `guild_id`);
+UPDATE command_aliases SET `guild_id` = (SELECT `guild` FROM guilds WHERE guilds.`id` = `guild_id`);
+UPDATE events SET `guild_id` = (SELECT `guild` FROM guilds WHERE guilds.`id` = `guild_id`);
+UPDATE guild_users SET `guild` = (SELECT `guild` FROM guilds WHERE guilds.`id` = guild_users.`guild`);
+UPDATE macro SET `guild_id` = (SELECT `guild` FROM guilds WHERE guilds.`id` = `guild_id`);
+UPDATE roles SET `guild_id` = (SELECT `guild` FROM guilds WHERE guilds.`id` = `guild_id`);
+UPDATE todos SET `guild_id` = (SELECT `guild` FROM guilds WHERE guilds.`id` = `guild_id`);
+UPDATE reminder_template SET `guild_id` = (SELECT `guild` FROM guilds WHERE guilds.`id` = `guild_id`);
+
+-- update guilds table
+ALTER TABLE guilds MODIFY `id` BIGINT UNSIGNED NOT NULL;
+UPDATE guilds SET `id` = `guild`;
+ALTER TABLE guilds DROP COLUMN `guild`;
+ALTER TABLE guilds ADD COLUMN `default_channel` BIGINT UNSIGNED;
+ALTER TABLE guilds ADD CONSTRAINT `default_channel_fk`
+    FOREIGN KEY (`default_channel`)
+        REFERENCES channels(`channel`)
+        ON DELETE SET NULL
+        ON UPDATE CASCADE;
+
+-- re-add constraints
+ALTER TABLE channels ADD CONSTRAINT
+    FOREIGN KEY (`guild_id`)
+        REFERENCES guilds(`id`)
+        ON DELETE CASCADE
+        ON UPDATE CASCADE;
+
+ALTER TABLE command_aliases ADD CONSTRAINT
+    FOREIGN KEY (`guild_id`)
+        REFERENCES guilds(`id`)
+        ON DELETE CASCADE
+        ON UPDATE CASCADE;
+
+ALTER TABLE events ADD CONSTRAINT
+    FOREIGN KEY (`guild_id`)
+        REFERENCES guilds(`id`)
+        ON DELETE CASCADE
+        ON UPDATE CASCADE;
+
+ALTER TABLE guild_users ADD CONSTRAINT
+    FOREIGN KEY (`guild`)
+        REFERENCES guilds(`id`)
+        ON DELETE CASCADE
+        ON UPDATE CASCADE;
+
+ALTER TABLE macro ADD CONSTRAINT
+    FOREIGN KEY (`guild_id`)
+        REFERENCES guilds(`id`)
+        ON DELETE CASCADE
+        ON UPDATE CASCADE;
+
+ALTER TABLE roles ADD CONSTRAINT
+    FOREIGN KEY (`guild_id`)
+        REFERENCES guilds(`id`)
+        ON DELETE CASCADE
+        ON UPDATE CASCADE;
+
+ALTER TABLE todos ADD CONSTRAINT
+    FOREIGN KEY (`guild_id`)
+        REFERENCES guilds(`id`)
+        ON DELETE CASCADE
+        ON UPDATE CASCADE;
+
+
+COMMIT;
+
+SET foreign_key_checks = 1;

postman/Cargo.toml

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

postman/src/sender.rs

@@ -7,7 +7,7 @@ use regex::{Captures, Regex};
 use serde::Deserialize;
 use serenity::{
     builder::CreateEmbed,
-    http::{CacheHttp, Http, StatusCode},
+    http::{CacheHttp, Http, HttpError, StatusCode},
     model::{
         channel::{Channel, Embed as SerenityEmbed},
         id::ChannelId,
@@ -58,10 +58,10 @@ fn fmt_displacement(format: &str, seconds: u64) -> String {
 
 pub fn substitute(string: &str) -> String {
     let new = TIMEFROM_REGEX.replace(string, |caps: &Captures| {
-        let final_time = caps.name("time").unwrap().as_str();
+        let final_time = caps.name("time").map(|m| m.as_str().parse::<i64>().ok()).flatten();
-        let format = caps.name("format").unwrap().as_str();
+        let format = caps.name("format").map(|m| m.as_str());
 
-        if let Ok(final_time) = final_time.parse::<i64>() {
+        if let (Some(final_time), Some(format)) = (final_time, format) {
             let dt = NaiveDateTime::from_timestamp(final_time, 0);
             let now = Utc::now().naive_utc();
 
@@ -81,13 +81,11 @@ pub fn substitute(string: &str) -> String {
 
     TIMENOW_REGEX
         .replace(&new, |caps: &Captures| {
-            let timezone = caps.name("timezone").unwrap().as_str();
+            let timezone = caps.name("timezone").map(|m| m.as_str().parse::<Tz>().ok()).flatten();
+            let format = caps.name("format").map(|m| m.as_str());
 
-            println!("{}", timezone);
+            if let (Some(timezone), Some(format)) = (timezone, format) {
-
+                let now = Utc::now().with_timezone(&timezone);
-            if let Ok(tz) = timezone.parse::<Tz>() {
-                let format = caps.name("format").unwrap().as_str();
-                let now = Utc::now().with_timezone(&tz);
 
                 now.format(format).to_string()
             } else {
@@ -122,7 +120,7 @@ impl Embed {
         pool: impl Executor<'_, Database = Database> + Copy,
         id: u32,
     ) -> Option<Self> {
-        let mut embed = sqlx::query_as!(
+        match sqlx::query_as!(
             Self,
             r#"
             SELECT
@@ -142,21 +140,29 @@ impl Embed {
         )
         .fetch_one(pool)
         .await
-        .unwrap();
+        {
+            Ok(mut embed) => {
+                embed.title = substitute(&embed.title);
+                embed.description = substitute(&embed.description);
+                embed.footer = substitute(&embed.footer);
 
-        embed.title = substitute(&embed.title);
+                embed.fields.iter_mut().for_each(|mut field| {
-        embed.description = substitute(&embed.description);
+                    field.title = substitute(&field.title);
-        embed.footer = substitute(&embed.footer);
+                    field.value = substitute(&field.value);
+                });
 
-        embed.fields.iter_mut().for_each(|mut field| {
+                if embed.has_content() {
-            field.title = substitute(&field.title);
+                    Some(embed)
-            field.value = substitute(&field.value);
+                } else {
-        });
+                    None
+                }
+            }
 
-        if embed.has_content() {
+            Err(e) => {
-            Some(embed)
+                warn!("Error loading embed from reminder: {:?}", e);
-        } else {
+
-            None
+                None
+            }
         }
     }
 
@@ -220,7 +226,6 @@ impl Into<CreateEmbed> for Embed {
     }
 }
 
-#[derive(Debug)]
 pub struct Reminder {
     id: u32,
 
@@ -251,9 +256,9 @@ pub struct Reminder {
 
 impl Reminder {
     pub async fn fetch_reminders(pool: impl Executor<'_, Database = Database> + Copy) -> Vec<Self> {
-        sqlx::query_as_unchecked!(
+        match sqlx::query_as_unchecked!(
             Reminder,
-            "
+            r#"
 SELECT
     reminders.`id` AS id,
 
@@ -261,9 +266,9 @@ SELECT
     channels.`webhook_id` AS webhook_id,
     channels.`webhook_token` AS webhook_token,
 
-    channels.`paused` AS channel_paused,
+    channels.`paused` AS 'channel_paused',
-    channels.`paused_until` AS channel_paused_until,
+    channels.`paused_until` AS 'channel_paused_until',
-    reminders.`enabled` AS enabled,
+    reminders.`enabled` AS 'enabled',
 
     reminders.`tts` AS tts,
     reminders.`pin` AS pin,
@@ -274,7 +279,7 @@ SELECT
     reminders.`utc_time` AS 'utc_time',
     reminders.`timezone` AS timezone,
     reminders.`restartable` AS restartable,
-    reminders.`expires` AS expires,
+    reminders.`expires` AS 'expires',
     reminders.`interval_seconds` AS 'interval_seconds',
     reminders.`interval_months` AS 'interval_months',
 
@@ -287,19 +292,40 @@ INNER JOIN
 ON
     reminders.channel_id = channels.id
 WHERE
-    reminders.`utc_time` < NOW()
+    reminders.`id` IN (
-            ",
+        SELECT
+            MIN(id)
+        FROM
+            reminders
+        WHERE
+            reminders.`utc_time` <= NOW()
+            AND (
+                reminders.`interval_seconds` IS NOT NULL
+                OR reminders.`interval_months` IS NOT NULL
+                OR reminders.enabled
+            )
+        GROUP BY channel_id
+    )
+    "#,
         )
         .fetch_all(pool)
         .await
-        .unwrap()
+        {
-        .into_iter()
+            Ok(reminders) => reminders
-        .map(|mut rem| {
+                .into_iter()
-            rem.content = substitute(&rem.content);
+                .map(|mut rem| {
+                    rem.content = substitute(&rem.content);
 
-            rem
+                    rem
-        })
+                })
-        .collect::<Vec<Self>>()
+                .collect::<Vec<Self>>(),
+
+            Err(e) => {
+                warn!("Could not fetch reminders: {:?}", e);
+
+                vec![]
+            }
+        }
     }
 
     async fn reset_webhook(&self, pool: impl Executor<'_, Database = Database> + Copy) {
@@ -319,7 +345,7 @@ UPDATE channels SET webhook_id = NULL, webhook_token = NULL WHERE channel = ?
             let mut updated_reminder_time = self.utc_time;
 
             if let Some(interval) = self.interval_months {
-                let row = sqlx::query!(
+                match sqlx::query!(
                     // use the second date_add to force return value to datetime
                     "SELECT DATE_ADD(DATE_ADD(?, INTERVAL ? MONTH), INTERVAL 0 SECOND) AS new_time",
                     updated_reminder_time,
@@ -327,9 +353,25 @@ UPDATE channels SET webhook_id = NULL, webhook_token = NULL WHERE channel = ?
                 )
                 .fetch_one(pool)
                 .await
-                .unwrap();
+                {
+                    Ok(row) => match row.new_time {
+                        Some(datetime) => {
+                            updated_reminder_time = datetime;
+                        }
+                        None => {
+                            warn!("Could not update interval by months: got NULL");
 
-                updated_reminder_time = row.new_time.unwrap();
+                            updated_reminder_time += Duration::days(30);
+                        }
+                    },
+
+                    Err(e) => {
+                        warn!("Could not update interval by months: {:?}", e);
+
+                        // naively fallback to adding 30 days
+                        updated_reminder_time += Duration::days(30);
+                    }
+                }
             }
 
             if let Some(interval) = self.interval_seconds {
@@ -535,14 +577,19 @@ UPDATE `channels` SET paused = 0, paused_until = NULL WHERE `channel` = ?
             };
 
             if let Err(e) = result {
-                error!("Error sending {:?}: {:?}", self, e);
+                error!("Error sending reminder {}: {:?}", self.id, e);
 
                 if let Error::Http(error) = e {
-                    if error.status_code() == Some(StatusCode::from_u16(404).unwrap()) {
+                    if error.status_code() == Some(StatusCode::NOT_FOUND) {
-                        error!("Seeing channel is deleted. Removing reminder");
+                        warn!("Seeing channel is deleted. Removing reminder");
                         self.force_delete(pool).await;
-                    } else {
+                    } else if let HttpError::UnsuccessfulRequest(error) = *error {
-                        self.refresh(pool).await;
+                        if error.error.code == 50007 {
+                            warn!("User cannot receive DMs");
+                            self.force_delete(pool).await;
+                        } else {
+                            self.refresh(pool).await;
+                        }
                     }
                 } else {
                     self.refresh(pool).await;

src/commands/autocomplete.rs

@@ -0,0 +1,131 @@
+use std::time::{SystemTime, UNIX_EPOCH};
+
+use chrono_tz::TZ_VARIANTS;
+use poise::AutocompleteChoice;
+
+use crate::{models::CtxData, time_parser::natural_parser, Context};
+
+pub async fn timezone_autocomplete(ctx: Context<'_>, partial: &str) -> Vec<String> {
+    if partial.is_empty() {
+        ctx.data().popular_timezones.iter().map(|t| t.to_string()).collect::<Vec<String>>()
+    } else {
+        TZ_VARIANTS
+            .iter()
+            .filter(|tz| tz.to_string().contains(&partial))
+            .take(25)
+            .map(|t| t.to_string())
+            .collect::<Vec<String>>()
+    }
+}
+
+pub async fn macro_name_autocomplete(ctx: Context<'_>, partial: &str) -> Vec<String> {
+    sqlx::query!(
+        "
+SELECT name
+FROM macro
+WHERE
+    guild_id = ?
+    AND name LIKE CONCAT(?, '%')",
+        ctx.guild_id().unwrap().0,
+        partial,
+    )
+    .fetch_all(&ctx.data().database)
+    .await
+    .unwrap_or_default()
+    .iter()
+    .map(|s| s.name.clone())
+    .collect()
+}
+
+pub async fn multiline_autocomplete(
+    _ctx: Context<'_>,
+    partial: &str,
+) -> Vec<AutocompleteChoice<String>> {
+    if partial.is_empty() {
+        vec![AutocompleteChoice { name: "Multiline content...".to_string(), value: "".to_string() }]
+    } else {
+        vec![
+            AutocompleteChoice { name: partial.to_string(), value: partial.to_string() },
+            AutocompleteChoice { name: "Multiline content...".to_string(), value: "".to_string() },
+        ]
+    }
+}
+
+pub async fn time_hint_autocomplete(
+    ctx: Context<'_>,
+    partial: &str,
+) -> Vec<AutocompleteChoice<String>> {
+    if partial.is_empty() {
+        vec![AutocompleteChoice {
+            name: "Start typing a time...".to_string(),
+            value: "now".to_string(),
+        }]
+    } else {
+        match natural_parser(partial, &ctx.timezone().await.to_string()).await {
+            Some(timestamp) => match SystemTime::now().duration_since(UNIX_EPOCH) {
+                Ok(now) => {
+                    let diff = timestamp - now.as_secs() as i64;
+
+                    if diff < 0 {
+                        vec![AutocompleteChoice {
+                            name: "Time is in the past".to_string(),
+                            value: "now".to_string(),
+                        }]
+                    } else {
+                        if diff > 86400 {
+                            vec![
+                                AutocompleteChoice {
+                                    name: partial.to_string(),
+                                    value: partial.to_string(),
+                                },
+                                AutocompleteChoice {
+                                    name: format!(
+                                        "In approximately {} days, {} hours",
+                                        diff / 86400,
+                                        (diff % 86400) / 3600
+                                    ),
+                                    value: partial.to_string(),
+                                },
+                            ]
+                        } else if diff > 3600 {
+                            vec![
+                                AutocompleteChoice {
+                                    name: partial.to_string(),
+                                    value: partial.to_string(),
+                                },
+                                AutocompleteChoice {
+                                    name: format!("In approximately {} hours", diff / 3600),
+                                    value: partial.to_string(),
+                                },
+                            ]
+                        } else {
+                            vec![
+                                AutocompleteChoice {
+                                    name: partial.to_string(),
+                                    value: partial.to_string(),
+                                },
+                                AutocompleteChoice {
+                                    name: format!("In approximately {} minutes", diff / 60),
+                                    value: partial.to_string(),
+                                },
+                            ]
+                        }
+                    }
+                }
+                Err(_) => {
+                    vec![AutocompleteChoice {
+                        name: partial.to_string(),
+                        value: partial.to_string(),
+                    }]
+                }
+            },
+
+            None => {
+                vec![AutocompleteChoice {
+                    name: "Time not recognised".to_string(),
+                    value: "now".to_string(),
+                }]
+            }
+        }
+    }
+}

src/commands/command_macro/delete.rs

@@ -0,0 +1,46 @@
+use super::super::autocomplete::macro_name_autocomplete;
+use crate::{Context, Error};
+
+/// Delete a recorded macro
+#[poise::command(
+    slash_command,
+    rename = "delete",
+    guild_only = true,
+    default_member_permissions = "MANAGE_GUILD",
+    identifying_name = "delete_macro"
+)]
+pub async fn delete_macro(
+    ctx: Context<'_>,
+    #[description = "Name of macro to delete"]
+    #[autocomplete = "macro_name_autocomplete"]
+    name: String,
+) -> Result<(), Error> {
+    match sqlx::query!(
+        "
+SELECT id FROM macro WHERE guild_id = ? AND name = ?",
+        ctx.guild_id().unwrap().0,
+        name
+    )
+    .fetch_one(&ctx.data().database)
+    .await
+    {
+        Ok(row) => {
+            sqlx::query!("DELETE FROM macro WHERE id = ?", row.id)
+                .execute(&ctx.data().database)
+                .await
+                .unwrap();
+
+            ctx.say(format!("Macro \"{}\" deleted", name)).await?;
+        }
+
+        Err(sqlx::Error::RowNotFound) => {
+            ctx.say(format!("Macro \"{}\" not found", name)).await?;
+        }
+
+        Err(e) => {
+            panic!("{}", e);
+        }
+    }
+
+    Ok(())
+}

src/commands/command_macro/list.rs

@@ -0,0 +1,89 @@
+use poise::CreateReply;
+
+use crate::{
+    component_models::pager::{MacroPager, Pager},
+    consts::THEME_COLOR,
+    models::{command_macro::CommandMacro, CtxData},
+    Context, Error,
+};
+
+/// List recorded macros
+#[poise::command(
+    slash_command,
+    rename = "list",
+    guild_only = true,
+    default_member_permissions = "MANAGE_GUILD",
+    identifying_name = "list_macro"
+)]
+pub async fn list_macro(ctx: Context<'_>) -> Result<(), Error> {
+    let macros = ctx.command_macros().await?;
+
+    let resp = show_macro_page(&macros, 0);
+
+    ctx.send(|m| {
+        *m = resp;
+        m
+    })
+    .await?;
+
+    Ok(())
+}
+
+pub fn max_macro_page<U, E>(macros: &[CommandMacro<U, E>]) -> usize {
+    ((macros.len() as f64) / 25.0).ceil() as usize
+}
+
+pub fn show_macro_page<U, E>(macros: &[CommandMacro<U, E>], page: usize) -> CreateReply {
+    let pager = MacroPager::new(page);
+
+    if macros.is_empty() {
+        let mut reply = CreateReply::default();
+
+        reply.embed(|e| {
+            e.title("Macros")
+                .description("No Macros Set Up. Use `/macro record` to get started.")
+                .color(*THEME_COLOR)
+        });
+
+        return reply;
+    }
+
+    let pages = max_macro_page(macros);
+
+    let mut page = page;
+    if page >= pages {
+        page = pages - 1;
+    }
+
+    let lower = (page * 25).min(macros.len());
+    let upper = ((page + 1) * 25).min(macros.len());
+
+    let fields = macros[lower..upper].iter().map(|m| {
+        if let Some(description) = &m.description {
+            (
+                m.name.clone(),
+                format!("*{}*\n- Has {} commands", description, m.commands.len()),
+                true,
+            )
+        } else {
+            (m.name.clone(), format!("- Has {} commands", m.commands.len()), true)
+        }
+    });
+
+    let mut reply = CreateReply::default();
+
+    reply
+        .embed(|e| {
+            e.title("Macros")
+                .fields(fields)
+                .footer(|f| f.text(format!("Page {} of {}", page + 1, pages)))
+                .color(*THEME_COLOR)
+        })
+        .components(|comp| {
+            pager.create_button_row(pages, comp);
+
+            comp
+        });
+
+    reply
+}

src/commands/command_macro/migrate.rs

@@ -0,0 +1,229 @@
+use lazy_regex::regex;
+use poise::serenity_prelude::command::CommandOptionType;
+use regex::Captures;
+use serde_json::{json, Value};
+
+use crate::{models::command_macro::RawCommandMacro, Context, Error, GuildId};
+
+struct Alias {
+    name: String,
+    command: String,
+}
+
+/// Migrate old $alias reminder commands to macros. Only macro names that are not taken will be used.
+#[poise::command(
+    slash_command,
+    rename = "migrate",
+    guild_only = true,
+    default_member_permissions = "MANAGE_GUILD",
+    identifying_name = "migrate_macro"
+)]
+pub async fn migrate_macro(ctx: Context<'_>) -> Result<(), Error> {
+    let guild_id = ctx.guild_id().unwrap();
+    let mut transaction = ctx.data().database.begin().await?;
+
+    let aliases = sqlx::query_as!(
+        Alias,
+        "SELECT name, command FROM command_aliases WHERE guild_id = ?",
+        guild_id.0
+    )
+    .fetch_all(&mut transaction)
+    .await?;
+
+    let mut added_aliases = 0;
+
+    for alias in aliases {
+        match parse_text_command(guild_id, alias.name, &alias.command) {
+            Some(cmd_macro) => {
+                sqlx::query!(
+                    "INSERT INTO macro (guild_id, name, description, commands) VALUES (?, ?, ?, ?)",
+                    cmd_macro.guild_id.0,
+                    cmd_macro.name,
+                    cmd_macro.description,
+                    cmd_macro.commands
+                )
+                .execute(&mut transaction)
+                .await?;
+
+                added_aliases += 1;
+            }
+
+            None => {}
+        }
+    }
+
+    transaction.commit().await?;
+
+    ctx.send(|b| b.content(format!("Added {} macros.", added_aliases))).await?;
+
+    Ok(())
+}
+
+fn parse_text_command(
+    guild_id: GuildId,
+    alias_name: String,
+    command: &str,
+) -> Option<RawCommandMacro> {
+    match command.split_once(" ") {
+        Some((command_word, args)) => {
+            let command_word = command_word.to_lowercase();
+
+            if command_word == "r"
+                || command_word == "i"
+                || command_word == "remind"
+                || command_word == "interval"
+            {
+                let matcher = regex!(
+                    r#"(?P<mentions>(?:<@\d+>\s+|<@!\d+>\s+|<#\d+>\s+)*)(?P<time>(?:(?:\d+)(?:s|m|h|d|:|/|-|))+)(?:\s+(?P<interval>(?:(?:\d+)(?:s|m|h|d|))+))?(?:\s+(?P<expires>(?:(?:\d+)(?:s|m|h|d|:|/|-|))+))?\s+(?P<content>.*)"#s
+                );
+
+                match matcher.captures(&args) {
+                    Some(captures) => {
+                        let mut args: Vec<Value> = vec![];
+
+                        if let Some(group) = captures.name("time") {
+                            let content = group.as_str();
+                            args.push(json!({
+                                "name": "time",
+                                "value": content,
+                                "type": CommandOptionType::String,
+                            }));
+                        }
+
+                        if let Some(group) = captures.name("content") {
+                            let content = group.as_str();
+                            args.push(json!({
+                                "name": "content",
+                                "value": content,
+                                "type": CommandOptionType::String,
+                            }));
+                        }
+
+                        if let Some(group) = captures.name("interval") {
+                            let content = group.as_str();
+                            args.push(json!({
+                                "name": "interval",
+                                "value": content,
+                                "type": CommandOptionType::String,
+                            }));
+                        }
+
+                        if let Some(group) = captures.name("expires") {
+                            let content = group.as_str();
+                            args.push(json!({
+                                "name": "expires",
+                                "value": content,
+                                "type": CommandOptionType::String,
+                            }));
+                        }
+
+                        if let Some(group) = captures.name("mentions") {
+                            let content = group.as_str();
+                            args.push(json!({
+                                "name": "channels",
+                                "value": content,
+                                "type": CommandOptionType::String,
+                            }));
+                        }
+
+                        Some(RawCommandMacro {
+                            guild_id,
+                            name: alias_name,
+                            description: None,
+                            commands: json!([
+                                {
+                                    "command_name": "remind",
+                                    "options": args,
+                                }
+                            ]),
+                        })
+                    }
+
+                    None => None,
+                }
+            } else if command_word == "n" || command_word == "natural" {
+                let matcher_primary = regex!(
+                    r#"(?P<time>.*?)(?:\s+)(?:send|say)(?:\s+)(?P<content>.*?)(?:(?:\s+)to(?:\s+)(?P<mentions>((?:<@\d+>)|(?:<@!\d+>)|(?:<#\d+>)|(?:\s+))+))?$"#s
+                );
+                let matcher_secondary = regex!(
+                    r#"(?P<msg>.*)(?:\s+)every(?:\s+)(?P<interval>.*?)(?:(?:\s+)(?:until|for)(?:\s+)(?P<expires>.*?))?$"#s
+                );
+
+                match matcher_primary.captures(&args) {
+                    Some(captures) => {
+                        let captures_secondary = matcher_secondary.captures(&args);
+
+                        let mut args: Vec<Value> = vec![];
+
+                        if let Some(group) = captures.name("time") {
+                            let content = group.as_str();
+                            args.push(json!({
+                                "name": "time",
+                                "value": content,
+                                "type": CommandOptionType::String,
+                            }));
+                        }
+
+                        if let Some(group) = captures.name("content") {
+                            let content = group.as_str();
+                            args.push(json!({
+                                "name": "content",
+                                "value": content,
+                                "type": CommandOptionType::String,
+                            }));
+                        }
+
+                        if let Some(group) =
+                            captures_secondary.as_ref().and_then(|c: &Captures| c.name("interval"))
+                        {
+                            let content = group.as_str();
+                            args.push(json!({
+                                "name": "interval",
+                                "value": content,
+                                "type": CommandOptionType::String,
+                            }));
+                        }
+
+                        if let Some(group) =
+                            captures_secondary.and_then(|c: Captures| c.name("expires"))
+                        {
+                            let content = group.as_str();
+                            args.push(json!({
+                                "name": "expires",
+                                "value": content,
+                                "type": CommandOptionType::String,
+                            }));
+                        }
+
+                        if let Some(group) = captures.name("mentions") {
+                            let content = group.as_str();
+                            args.push(json!({
+                                "name": "channels",
+                                "value": content,
+                                "type": CommandOptionType::String,
+                            }));
+                        }
+
+                        Some(RawCommandMacro {
+                            guild_id,
+                            name: alias_name,
+                            description: None,
+                            commands: json!([
+                                {
+                                    "command_name": "remind",
+                                    "options": args,
+                                }
+                            ]),
+                        })
+                    }
+
+                    None => None,
+                }
+            } else {
+                None
+            }
+        }
+
+        None => None,
+    }
+}

src/commands/command_macro/mod.rs

@@ -0,0 +1,19 @@
+use crate::{Context, Error};
+
+pub mod delete;
+pub mod list;
+pub mod migrate;
+pub mod record;
+pub mod run;
+
+/// Record and replay command sequences
+#[poise::command(
+    slash_command,
+    rename = "macro",
+    guild_only = true,
+    default_member_permissions = "MANAGE_GUILD",
+    identifying_name = "macro_base"
+)]
+pub async fn macro_base(_ctx: Context<'_>) -> Result<(), Error> {
+    Ok(())
+}

src/commands/command_macro/record.rs

@@ -0,0 +1,151 @@
+use std::collections::hash_map::Entry;
+
+use crate::{consts::THEME_COLOR, models::command_macro::CommandMacro, Context, Error};
+
+/// Start recording up to 5 commands to replay
+#[poise::command(
+    slash_command,
+    rename = "record",
+    guild_only = true,
+    default_member_permissions = "MANAGE_GUILD",
+    identifying_name = "record_macro"
+)]
+pub async fn record_macro(
+    ctx: Context<'_>,
+    #[description = "Name for the new macro"] name: String,
+    #[description = "Description for the new macro"] description: Option<String>,
+) -> Result<(), Error> {
+    if name.len() > 100 {
+        ctx.say("Name must be less than 100 characters").await?;
+
+        return Ok(());
+    }
+
+    if description.as_ref().map_or(0, |d| d.len()) > 100 {
+        ctx.say("Description must be less than 100 characters").await?;
+
+        return Ok(());
+    }
+
+    let guild_id = ctx.guild_id().unwrap();
+
+    let row = sqlx::query!(
+        "
+SELECT 1 as _e FROM macro WHERE guild_id = ? AND name = ?",
+        guild_id.0,
+        name
+    )
+    .fetch_one(&ctx.data().database)
+    .await;
+
+    if row.is_ok() {
+        ctx.send(|m| {
+            m.ephemeral(true).embed(|e| {
+                e.title("Unique Name Required")
+                    .description(
+                        "A macro already exists under this name.
+Please select a unique name for your macro.",
+                    )
+                    .color(*THEME_COLOR)
+            })
+        })
+        .await?;
+    } else {
+        let okay = {
+            let mut lock = ctx.data().recording_macros.write().await;
+
+            if let Entry::Vacant(e) = lock.entry((guild_id, ctx.author().id)) {
+                e.insert(CommandMacro { guild_id, name, description, commands: vec![] });
+                true
+            } else {
+                false
+            }
+        };
+
+        if okay {
+            ctx.send(|m| {
+                m.ephemeral(true).embed(|e| {
+                    e.title("Macro Recording Started")
+                        .description(
+                            "Run up to 5 commands, or type `/macro finish` to stop at any point.
+Any commands ran as part of recording will be inconsequential",
+                        )
+                        .color(*THEME_COLOR)
+                })
+            })
+            .await?;
+        } else {
+            ctx.send(|m| {
+                m.ephemeral(true).embed(|e| {
+                    e.title("Macro Already Recording")
+                        .description(
+                            "You are already recording a macro in this server.
+Please use `/macro finish` to end this recording before starting another.",
+                        )
+                        .color(*THEME_COLOR)
+                })
+            })
+            .await?;
+        }
+    }
+
+    Ok(())
+}
+
+/// Finish current macro recording
+#[poise::command(
+    slash_command,
+    rename = "finish",
+    guild_only = true,
+    default_member_permissions = "MANAGE_GUILD",
+    identifying_name = "finish_macro"
+)]
+pub async fn finish_macro(ctx: Context<'_>) -> Result<(), Error> {
+    let key = (ctx.guild_id().unwrap(), ctx.author().id);
+
+    {
+        let lock = ctx.data().recording_macros.read().await;
+        let contained = lock.get(&key);
+
+        if contained.map_or(true, |cmacro| cmacro.commands.is_empty()) {
+            ctx.send(|m| {
+                m.embed(|e| {
+                    e.title("No Macro Recorded")
+                        .description("Use `/macro record` to start recording a macro")
+                        .color(*THEME_COLOR)
+                })
+            })
+            .await?;
+        } else {
+            let command_macro = contained.unwrap();
+            let json = serde_json::to_string(&command_macro.commands).unwrap();
+
+            sqlx::query!(
+                "INSERT INTO macro (guild_id, name, description, commands) VALUES (?, ?, ?, ?)",
+                command_macro.guild_id.0,
+                command_macro.name,
+                command_macro.description,
+                json
+            )
+            .execute(&ctx.data().database)
+            .await
+            .unwrap();
+
+            ctx.send(|m| {
+                m.embed(|e| {
+                    e.title("Macro Recorded")
+                        .description("Use `/macro run` to execute the macro")
+                        .color(*THEME_COLOR)
+                })
+            })
+            .await?;
+        }
+    }
+
+    {
+        let mut lock = ctx.data().recording_macros.write().await;
+        lock.remove(&key);
+    }
+
+    Ok(())
+}

src/commands/command_macro/run.rs

@@ -0,0 +1,46 @@
+use super::super::autocomplete::macro_name_autocomplete;
+use crate::{models::command_macro::guild_command_macro, Context, Data, Error};
+
+/// Run a recorded macro
+#[poise::command(
+    slash_command,
+    rename = "run",
+    guild_only = true,
+    default_member_permissions = "MANAGE_GUILD",
+    identifying_name = "run_macro"
+)]
+pub async fn run_macro(
+    ctx: poise::ApplicationContext<'_, Data, Error>,
+    #[description = "Name of macro to run"]
+    #[autocomplete = "macro_name_autocomplete"]
+    name: String,
+) -> Result<(), Error> {
+    match guild_command_macro(&Context::Application(ctx), &name).await {
+        Some(command_macro) => {
+            ctx.defer_response(false).await?;
+
+            for command in command_macro.commands {
+                if let Some(action) = command.action {
+                    match (action)(poise::ApplicationContext { args: &command.options, ..ctx })
+                        .await
+                    {
+                        Ok(()) => {}
+                        Err(e) => {
+                            println!("{:?}", e);
+                        }
+                    }
+                } else {
+                    Context::Application(ctx)
+                        .say(format!("Command \"{}\" not found", command.command_name))
+                        .await?;
+                }
+            }
+        }
+
+        None => {
+            Context::Application(ctx).say(format!("Macro \"{}\" not found", name)).await?;
+        }
+    }
+
+    Ok(())
+}

src/commands/info_cmds.rs

@@ -49,6 +49,7 @@ __Todo Commands__
 
 __Setup Commands__
 `/timezone` - Set your timezone (necessary for `/remind` to work properly)
+`/dm allow/block` - Change your DM settings for reminders.
 
 __Advanced Commands__
 `/macro` - Record and replay command sequences
@@ -71,7 +72,7 @@ pub async fn info(ctx: Context<'_>) -> Result<(), Error> {
         .send(|m| {
             m.ephemeral(true).embed(|e| {
                 e.title("Info")
-                    .description(format!(
+                    .description(
                         "Help: `/help`
 
 **Welcome to Reminder Bot!**
@@ -81,7 +82,7 @@ Find me on https://discord.jellywx.com and on https://github.com/JellyWX :)
 
 Invite the bot: https://invite.reminder-bot.com/
 Use our dashboard: https://reminder-bot.com/",
-                    ))
+                    )
                     .footer(footer)
                     .color(*THEME_COLOR)
             })

src/commands/mod.rs

@@ -1,3 +1,5 @@
+mod autocomplete;
+pub mod command_macro;
 pub mod info_cmds;
 pub mod moderation_cmds;
 pub mod reminder_cmds;

src/commands/moderation_cmds.rs

@@ -1,30 +1,11 @@
 use chrono::offset::Utc;
 use chrono_tz::{Tz, TZ_VARIANTS};
 use levenshtein::levenshtein;
-use poise::CreateReply;
+use log::warn;
+use poise::serenity_prelude::{ChannelId, Mentionable};
 
-use crate::{
+use super::autocomplete::timezone_autocomplete;
-    component_models::pager::{MacroPager, Pager},
+use crate::{consts::THEME_COLOR, models::CtxData, Context, Error};
-    consts::{EMBED_DESCRIPTION_MAX_LENGTH, THEME_COLOR},
-    models::{
-        command_macro::{guild_command_macro, CommandMacro},
-        CtxData,
-    },
-    Context, Data, Error,
-};
-
-async fn timezone_autocomplete(ctx: Context<'_>, partial: String) -> Vec<String> {
-    if partial.is_empty() {
-        ctx.data().popular_timezones.iter().map(|t| t.to_string()).collect::<Vec<String>>()
-    } else {
-        TZ_VARIANTS
-            .iter()
-            .filter(|tz| tz.to_string().contains(&partial))
-            .take(25)
-            .map(|t| t.to_string())
-            .collect::<Vec<String>>()
-    }
-}
 
 /// Select your timezone
 #[poise::command(slash_command, identifying_name = "timezone")]
@@ -52,7 +33,7 @@ pub async fn timezone(
                             .description(format!(
                                 "Timezone has been set to **{}**. Your current time should be `{}`",
                                 timezone,
-                                now.format("%H:%M").to_string()
+                                now.format("%H:%M")
                             ))
                             .color(*THEME_COLOR)
                     })
@@ -75,10 +56,7 @@ pub async fn timezone(
                 let fields = filtered_tz.iter().map(|tz| {
                     (
                         tz.to_string(),
-                        format!(
+                        format!("🕗 `{}`", Utc::now().with_timezone(tz).format("%H:%M")),
-                            "🕗 `{}`",
-                            Utc::now().with_timezone(tz).format("%H:%M").to_string()
-                        ),
                         true,
                     )
                 });
@@ -98,11 +76,7 @@ pub async fn timezone(
         }
     } else {
         let popular_timezones_iter = ctx.data().popular_timezones.iter().map(|t| {
-            (
+            (t.to_string(), format!("🕗 `{}`", Utc::now().with_timezone(t).format("%H:%M")), true)
-                t.to_string(),
-                format!("🕗 `{}`", Utc::now().with_timezone(t).format("%H:%M").to_string()),
-                true,
-            )
         });
 
         ctx.send(|m| {
@@ -129,379 +103,122 @@ You may want to use one of the popular timezones below, otherwise click [here](h
     Ok(())
 }
 
-async fn macro_name_autocomplete(ctx: Context<'_>, partial: String) -> Vec<String> {
+/// Configure whether other users can set reminders to your direct messages
-    sqlx::query!(
+#[poise::command(slash_command, rename = "dm", identifying_name = "allowed_dm")]
-        "
+pub async fn allowed_dm(_ctx: Context<'_>) -> Result<(), Error> {
-SELECT name
-FROM macro
-WHERE
-    guild_id = (SELECT id FROM guilds WHERE guild = ?)
-    AND name LIKE CONCAT(?, '%')",
-        ctx.guild_id().unwrap().0,
-        partial,
-    )
-    .fetch_all(&ctx.data().database)
-    .await
-    .unwrap_or(vec![])
-    .iter()
-    .map(|s| s.name.clone())
-    .collect()
-}
-
-/// Record and replay command sequences
-#[poise::command(
-    slash_command,
-    rename = "macro",
-    guild_only = true,
-    default_member_permissions = "MANAGE_GUILD",
-    identifying_name = "macro_base"
-)]
-pub async fn macro_base(_ctx: Context<'_>) -> Result<(), Error> {
     Ok(())
 }
 
-/// Start recording up to 5 commands to replay
+/// Allow other users to set reminders in your direct messages
-#[poise::command(
+#[poise::command(slash_command, rename = "allow", identifying_name = "allowed_dm")]
-    slash_command,
+pub async fn set_allowed_dm(ctx: Context<'_>) -> Result<(), Error> {
-    rename = "record",
+    let mut user_data = ctx.author_data().await?;
-    guild_only = true,
+    user_data.allowed_dm = true;
-    default_member_permissions = "MANAGE_GUILD",
+    user_data.commit_changes(&ctx.data().database).await;
-    identifying_name = "record_macro"
-)]
-pub async fn record_macro(
-    ctx: Context<'_>,
-    #[description = "Name for the new macro"] name: String,
-    #[description = "Description for the new macro"] description: Option<String>,
-) -> Result<(), Error> {
-    let guild_id = ctx.guild_id().unwrap();
 
-    let row = sqlx::query!(
+    ctx.send(|r| {
-        "
+        r.ephemeral(true).embed(|e| {
-SELECT 1 as _e FROM macro WHERE guild_id = (SELECT id FROM guilds WHERE guild = ?) AND name = ?",
+            e.title("DMs permitted")
-        guild_id.0,
+                .description("You will receive a message if a user sets a DM reminder for you.")
-        name
+                .color(*THEME_COLOR)
-    )
-    .fetch_one(&ctx.data().database)
-    .await;
-
-    if row.is_ok() {
-        ctx.send(|m| {
-            m.ephemeral(true).embed(|e| {
-                e.title("Unique Name Required")
-                    .description(
-                        "A macro already exists under this name.
-Please select a unique name for your macro.",
-                    )
-                    .color(*THEME_COLOR)
-            })
         })
-        .await?;
-    } else {
-        let okay = {
-            let mut lock = ctx.data().recording_macros.write().await;
-
-            if lock.contains_key(&(guild_id, ctx.author().id)) {
-                false
-            } else {
-                lock.insert(
-                    (guild_id, ctx.author().id),
-                    CommandMacro { guild_id, name, description, commands: vec![] },
-                );
-                true
-            }
-        };
-
-        if okay {
-            ctx.send(|m| {
-                m.ephemeral(true).embed(|e| {
-                    e.title("Macro Recording Started")
-                        .description(
-                            "Run up to 5 commands, or type `/macro finish` to stop at any point.
-Any commands ran as part of recording will be inconsequential",
-                        )
-                        .color(*THEME_COLOR)
-                })
-            })
-            .await?;
-        } else {
-            ctx.send(|m| {
-                m.ephemeral(true).embed(|e| {
-                    e.title("Macro Already Recording")
-                        .description(
-                            "You are already recording a macro in this server.
-Please use `/macro finish` to end this recording before starting another.",
-                        )
-                        .color(*THEME_COLOR)
-                })
-            })
-            .await?;
-        }
-    }
-
-    Ok(())
-}
-
-/// Finish current macro recording
-#[poise::command(
-    slash_command,
-    rename = "finish",
-    guild_only = true,
-    default_member_permissions = "MANAGE_GUILD",
-    identifying_name = "finish_macro"
-)]
-pub async fn finish_macro(ctx: Context<'_>) -> Result<(), Error> {
-    let key = (ctx.guild_id().unwrap(), ctx.author().id);
-
-    {
-        let lock = ctx.data().recording_macros.read().await;
-        let contained = lock.get(&key);
-
-        if contained.map_or(true, |cmacro| cmacro.commands.is_empty()) {
-            ctx.send(|m| {
-                m.embed(|e| {
-                    e.title("No Macro Recorded")
-                        .description("Use `/macro record` to start recording a macro")
-                        .color(*THEME_COLOR)
-                })
-            })
-            .await?;
-        } else {
-            let command_macro = contained.unwrap();
-            let json = serde_json::to_string(&command_macro.commands).unwrap();
-
-            sqlx::query!(
-                "INSERT INTO macro (guild_id, name, description, commands) VALUES ((SELECT id FROM guilds WHERE guild = ?), ?, ?, ?)",
-                command_macro.guild_id.0,
-                command_macro.name,
-                command_macro.description,
-                json
-            )
-                .execute(&ctx.data().database)
-                .await
-                .unwrap();
-
-            ctx.send(|m| {
-                m.embed(|e| {
-                    e.title("Macro Recorded")
-                        .description("Use `/macro run` to execute the macro")
-                        .color(*THEME_COLOR)
-                })
-            })
-            .await?;
-        }
-    }
-
-    {
-        let mut lock = ctx.data().recording_macros.write().await;
-        lock.remove(&key);
-    }
-
-    Ok(())
-}
-
-/// List recorded macros
-#[poise::command(
-    slash_command,
-    rename = "list",
-    guild_only = true,
-    default_member_permissions = "MANAGE_GUILD",
-    identifying_name = "list_macro"
-)]
-pub async fn list_macro(ctx: Context<'_>) -> Result<(), Error> {
-    let macros = ctx.command_macros().await?;
-
-    let resp = show_macro_page(&macros, 0);
-
-    ctx.send(|m| {
-        *m = resp;
-        m
     })
     .await?;
 
     Ok(())
 }
 
-/// Run a recorded macro
+/// Block other users from setting reminders in your direct messages
-#[poise::command(
+#[poise::command(slash_command, rename = "block", identifying_name = "allowed_dm")]
-    slash_command,
+pub async fn unset_allowed_dm(ctx: Context<'_>) -> Result<(), Error> {
-    rename = "run",
+    let mut user_data = ctx.author_data().await?;
-    guild_only = true,
+    user_data.allowed_dm = false;
-    default_member_permissions = "MANAGE_GUILD",
+    user_data.commit_changes(&ctx.data().database).await;
-    identifying_name = "run_macro"
-)]
-pub async fn run_macro(
-    ctx: poise::ApplicationContext<'_, Data, Error>,
-    #[description = "Name of macro to run"]
-    #[autocomplete = "macro_name_autocomplete"]
-    name: String,
-) -> Result<(), Error> {
-    match guild_command_macro(&Context::Application(ctx), &name).await {
-        Some(command_macro) => {
-            ctx.defer_response(false).await?;
 
-            for command in command_macro.commands {
+    ctx.send(|r| {
-                if let Some(action) = command.action {
+        r.ephemeral(true).embed(|e| {
-                    match (action)(poise::ApplicationContext { args: &command.options, ..ctx })
+            e.title("DMs blocked")
-                        .await
+                .description(
-                    {
+                    "You can still set DM reminders for yourself or for users with DMs enabled.",
-                        Ok(()) => {}
+                )
-                        Err(e) => {
+                .color(*THEME_COLOR)
-                            println!("{:?}", e);
+        })
-                        }
+    })
-                    }
+    .await?;
-                } else {
-                    Context::Application(ctx)
-                        .say(format!("Command \"{}\" not found", command.command_name))
-                        .await?;
-                }
-            }
-        }
-
-        None => {
-            Context::Application(ctx).say(format!("Macro \"{}\" not found", name)).await?;
-        }
-    }
 
     Ok(())
 }
 
-/// Delete a recorded macro
+/// Set defaults for commands
 #[poise::command(
     slash_command,
-    rename = "delete",
+    identifying_name = "default",
-    guild_only = true,
+    default_member_permissions = "MANAGE_GUILD"
-    default_member_permissions = "MANAGE_GUILD",
-    identifying_name = "delete_macro"
 )]
-pub async fn delete_macro(
+pub async fn default(_ctx: Context<'_>) -> Result<(), Error> {
+    Ok(())
+}
+
+/// Set a default channel for reminders to be sent to
+#[poise::command(
+    slash_command,
+    guild_only = true,
+    identifying_name = "default_channel",
+    default_member_permissions = "MANAGE_GUILD"
+)]
+pub async fn default_channel(
     ctx: Context<'_>,
-    #[description = "Name of macro to delete"]
+    #[description = "Channel to send reminders to by default"] channel: Option<ChannelId>,
-    #[autocomplete = "macro_name_autocomplete"]
-    name: String,
 ) -> Result<(), Error> {
-    match sqlx::query!(
+    if let Some(mut guild_data) = ctx.guild_data().await {
-        "
+        guild_data.default_channel = channel.map(|c| c.0);
-SELECT id FROM macro WHERE guild_id = (SELECT id FROM guilds WHERE guild = ?) AND name = ?",
-        ctx.guild_id().unwrap().0,
-        name
-    )
-    .fetch_one(&ctx.data().database)
-    .await
-    {
-        Ok(row) => {
-            sqlx::query!("DELETE FROM macro WHERE id = ?", row.id)
-                .execute(&ctx.data().database)
-                .await
-                .unwrap();
 
-            ctx.say(format!("Macro \"{}\" deleted", name)).await?;
+        guild_data.commit_changes(&ctx.data().database).await?;
-        }
 
-        Err(sqlx::Error::RowNotFound) => {
+        if let Some(channel) = channel {
-            ctx.say(format!("Macro \"{}\" not found", name)).await?;
+            ctx.send(|r| {
-        }
+                r.ephemeral(true).content(format!("Default channel set to {}", channel.mention()))
-
+            })
-        Err(e) => {
+            .await?;
-            panic!("{}", e);
+        } else {
+            ctx.send(|r| r.ephemeral(true).content("Default channel unset.")).await?;
         }
     }
 
     Ok(())
 }
 
-pub fn max_macro_page<U, E>(macros: &[CommandMacro<U, E>]) -> usize {
+/// View the webhook being used to send reminders to this channel
-    let mut skipped_char_count = 0;
+#[poise::command(
-
+    slash_command,
-    macros
+    identifying_name = "webhook_url",
-        .iter()
+    required_permissions = "ADMINISTRATOR",
-        .map(|m| {
+    default_member_permissions = "ADMINISTRATOR"
-            if let Some(description) = &m.description {
+)]
-                format!("**{}**\n- *{}*\n- Has {} commands", m.name, description, m.commands.len())
+pub async fn webhook(ctx: Context<'_>) -> Result<(), Error> {
+    match ctx.channel_data().await {
+        Ok(data) => {
+            if let (Some(id), Some(token)) = (data.webhook_id, data.webhook_token) {
+                ctx.send(|b| {
+                    b.ephemeral(true).content(format!(
+                        "**Warning!**
+This link can be used by users to anonymously send messages, with or without permissions.
+Do not share it!
+|| https://discord.com/api/webhooks/{}/{} ||",
+                        id, token,
+                    ))
+                })
+                .await?;
             } else {
-                format!("**{}**\n- Has {} commands", m.name, m.commands.len())
+                ctx.say("No webhook configured on this channel.").await?;
             }
-        })
+        }
-        .fold(1, |mut pages, p| {
+        Err(e) => {
-            skipped_char_count += p.len();
+            warn!("Error fetching channel data: {:?}", e);
 
-            if skipped_char_count > EMBED_DESCRIPTION_MAX_LENGTH {
+            ctx.say("No webhook configured on this channel.").await?;
-                skipped_char_count = p.len();
+        }
-                pages += 1;
-            }
-
-            pages
-        })
-}
-
-pub fn show_macro_page<U, E>(macros: &[CommandMacro<U, E>], page: usize) -> CreateReply {
-    let pager = MacroPager::new(page);
-
-    if macros.is_empty() {
-        let mut reply = CreateReply::default();
-
-        reply.embed(|e| {
-            e.title("Macros")
-                .description("No Macros Set Up. Use `/macro record` to get started.")
-                .color(*THEME_COLOR)
-        });
-
-        return reply;
     }
 
-    let pages = max_macro_page(macros);
+    Ok(())
-
-    let mut page = page;
-    if page >= pages {
-        page = pages - 1;
-    }
-
-    let mut char_count = 0;
-    let mut skipped_char_count = 0;
-
-    let mut skipped_pages = 0;
-
-    let display_vec: Vec<String> = macros
-        .iter()
-        .map(|m| {
-            if let Some(description) = &m.description {
-                format!("**{}**\n- *{}*\n- Has {} commands", m.name, description, m.commands.len())
-            } else {
-                format!("**{}**\n- Has {} commands", m.name, m.commands.len())
-            }
-        })
-        .skip_while(|p| {
-            skipped_char_count += p.len();
-
-            if skipped_char_count > EMBED_DESCRIPTION_MAX_LENGTH {
-                skipped_char_count = p.len();
-                skipped_pages += 1;
-            }
-
-            skipped_pages < page
-        })
-        .take_while(|p| {
-            char_count += p.len();
-
-            char_count < EMBED_DESCRIPTION_MAX_LENGTH
-        })
-        .collect::<Vec<String>>();
-
-    let display = display_vec.join("\n");
-
-    let mut reply = CreateReply::default();
-
-    reply
-        .embed(|e| {
-            e.title("Macros")
-                .description(display)
-                .footer(|f| f.text(format!("Page {} of {}", page + 1, pages)))
-                .color(*THEME_COLOR)
-        })
-        .components(|comp| {
-            pager.create_button_row(pages, comp);
-
-            comp
-        });
-
-    reply
 }

src/commands/reminder_cmds.rs

@@ -8,14 +8,19 @@ use chrono::NaiveDateTime;
 use chrono_tz::Tz;
 use num_integer::Integer;
 use poise::{
-    serenity::{builder::CreateEmbed, model::channel::Channel},
+    serenity_prelude::{
-    CreateReply,
+        builder::CreateEmbed, component::ButtonStyle, model::channel::Channel, ReactionType,
+    },
+    CreateReply, Modal,
 };
 
 use crate::{
+    commands::autocomplete::{
+        multiline_autocomplete, time_hint_autocomplete, timezone_autocomplete,
+    },
     component_models::{
         pager::{DelPager, LookPager, Pager},
-        ComponentDataModel, DelSelector,
+        ComponentDataModel, DelSelector, UndoReminder,
     },
     consts::{
         EMBED_DESCRIPTION_MAX_LENGTH, HOUR, MINUTE, REGEX_CHANNEL_USER, SELECT_MAX_ENTRIES,
@@ -35,7 +40,7 @@ use crate::{
     },
     time_parser::natural_parser,
     utils::{check_guild_subscription, check_subscription},
-    Context, Error,
+    ApplicationContext, Context, Error,
 };
 
 /// Pause all reminders on the current channel until a certain time or indefinitely
@@ -500,18 +505,16 @@ pub async fn start_timer(
     if count >= 25 {
         ctx.say("You already have 25 timers. Please delete some timers before creating a new one")
             .await?;
-    } else {
+    } else if name.len() <= 32 {
-        if name.len() <= 32 {
+        Timer::create(&name, owner, &ctx.data().database).await;
-            Timer::create(&name, owner, &ctx.data().database).await;
 
-            ctx.say("Created a new timer").await?;
+        ctx.say("Created a new timer").await?;
-        } else {
+    } else {
-            ctx.say(format!(
+        ctx.say(format!(
-                "Please name your timer something shorted (max. 32 characters, you used {})",
+            "Please name your timer something shorted (max. 32 characters, you used {})",
-                name.len()
+            name.len()
-            ))
+        ))
-            .await?;
+        .await?;
-        }
     }
 
     Ok(())
@@ -549,23 +552,81 @@ pub async fn delete_timer(
     Ok(())
 }
 
-/// Create a new reminder
+#[derive(poise::Modal)]
+#[name = "Reminder"]
+struct ContentModal {
+    #[name = "Content"]
+    #[placeholder = "Message..."]
+    #[paragraph]
+    #[max_length = 2000]
+    content: String,
+}
+
+/// Create a reminder. Press "+4 more" for other options.
 #[poise::command(
     slash_command,
     identifying_name = "remind",
     default_member_permissions = "MANAGE_GUILD"
 )]
 pub async fn remind(
-    ctx: Context<'_>,
+    ctx: ApplicationContext<'_>,
-    #[description = "A description of the time to set the reminder for"] time: String,
+    #[description = "A description of the time to set the reminder for"]
-    #[description = "The message content to send"] content: String,
+    #[autocomplete = "time_hint_autocomplete"]
+    time: String,
+    #[description = "The message content to send"]
+    #[autocomplete = "multiline_autocomplete"]
+    content: String,
     #[description = "Channel or user mentions to set the reminder for"] channels: Option<String>,
     #[description = "(Patreon only) Time to wait before repeating the reminder. Leave blank for one-shot reminder"]
     interval: Option<String>,
-    #[description = "(Patreon only) For repeating reminders, the time at which the reminder will stop sending"]
+    #[description = "(Patreon only) For repeating reminders, the time at which the reminder will stop repeating"]
     expires: Option<String>,
     #[description = "Set the TTS flag on the reminder message, similar to the /tts command"]
     tts: Option<bool>,
+    #[description = "Set a timezone override for this reminder only"]
+    #[autocomplete = "timezone_autocomplete"]
+    timezone: Option<String>,
+) -> Result<(), Error> {
+    let tz = timezone.map(|t| t.parse::<Tz>().ok()).flatten();
+
+    if content.is_empty() {
+        let data = ContentModal::execute(ctx).await?;
+
+        create_reminder(
+            Context::Application(ctx),
+            time,
+            data.content,
+            channels,
+            interval,
+            expires,
+            tts,
+            tz,
+        )
+        .await
+    } else {
+        create_reminder(
+            Context::Application(ctx),
+            time,
+            content,
+            channels,
+            interval,
+            expires,
+            tts,
+            tz,
+        )
+        .await
+    }
+}
+
+async fn create_reminder(
+    ctx: Context<'_>,
+    time: String,
+    content: String,
+    channels: Option<String>,
+    interval: Option<String>,
+    expires: Option<String>,
+    tts: Option<bool>,
+    timezone: Option<Tz>,
 ) -> Result<(), Error> {
     if interval.is_none() && expires.is_some() {
         ctx.say("`expires` can only be used with `interval`").await?;
@@ -576,7 +637,7 @@ pub async fn remind(
     ctx.defer().await?;
 
     let user_data = ctx.author_data().await.unwrap();
-    let timezone = ctx.timezone().await;
+    let timezone = timezone.unwrap_or(ctx.timezone().await);
 
     let time = natural_parser(&time, &timezone.to_string()).await;
 
@@ -589,11 +650,12 @@ pub async fn remind(
             };
 
             let scopes = {
-                let list =
+                let list = channels.map(|arg| parse_mention_list(&arg)).unwrap_or_default();
-                    channels.map(|arg| parse_mention_list(&arg.to_string())).unwrap_or_default();
 
                 if list.is_empty() {
-                    if ctx.guild_id().is_some() {
+                    if let Some(channel_id) = ctx.default_channel().await {
+                        vec![ReminderScope::Channel(channel_id.0)]
+                    } else if ctx.guild_id().is_some() {
                         vec![ReminderScope::Channel(ctx.channel_id().0)]
                     } else {
                         vec![ReminderScope::User(ctx.author().id.0)]
@@ -610,7 +672,7 @@ pub async fn remind(
                 {
                     (
                         parse_duration(repeat)
-                            .or_else(|_| parse_duration(&format!("1 {}", repeat.to_string())))
+                            .or_else(|_| parse_duration(&format!("1 {}", repeat)))
                             .ok(),
                         {
                             if let Some(arg) = &expires {
@@ -653,17 +715,50 @@ pub async fn remind(
 
                 let (errors, successes) = builder.build().await;
 
-                let embed = create_response(successes, errors, time);
+                let embed = create_response(&successes, &errors, time);
 
-                ctx.send(|m| {
+                if successes.len() == 1 {
-                    m.embed(|c| {
+                    let reminder = successes.iter().next().map(|(r, _)| r.id).unwrap();
-                        *c = embed;
+                    let undo_button = ComponentDataModel::UndoReminder(UndoReminder {
-                        c
+                        user_id: ctx.author().id,
+                        reminder_id: reminder,
+                    });
+
+                    ctx.send(|m| {
+                        m.embed(|c| {
+                            *c = embed;
+                            c
+                        })
+                        .components(|c| {
+                            c.create_action_row(|r| {
+                                r.create_button(|b| {
+                                    b.emoji(ReactionType::Unicode("🔕".to_string()))
+                                        .label("Cancel")
+                                        .style(ButtonStyle::Danger)
+                                        .custom_id(undo_button.to_custom_id())
+                                })
+                                .create_button(|b| {
+                                    b.emoji(ReactionType::Unicode("📝".to_string()))
+                                        .label("Edit")
+                                        .style(ButtonStyle::Link)
+                                        .url("https://reminder-bot.com/dashboard")
+                                })
+                            })
+                        })
                     })
-                })
+                    .await?;
-                .await?;
+                } else {
+                    ctx.send(|m| {
+                        m.embed(|c| {
+                            *c = embed;
+                            c
+                        })
+                    })
+                    .await?;
+                }
             }
         }
+
         None => {
             ctx.say("Time could not be processed").await?;
         }
@@ -673,8 +768,8 @@ pub async fn remind(
 }
 
 fn create_response(
-    successes: HashSet<ReminderScope>,
+    successes: &HashSet<(Reminder, ReminderScope)>,
-    errors: HashSet<ReminderError>,
+    errors: &HashSet<ReminderError>,
     time: i64,
 ) -> CreateEmbed {
     let success_part = match successes.len() {
@@ -682,7 +777,8 @@ fn create_response(
         n => format!(
             "Reminder{s} for {locations} set for <t:{offset}:R>",
             s = if n > 1 { "s" } else { "" },
-            locations = successes.iter().map(|l| l.mention()).collect::<Vec<String>>().join(", "),
+            locations =
+                successes.iter().map(|(_, l)| l.mention()).collect::<Vec<String>>().join(", "),
             offset = time
         ),
     };

src/commands/todo_cmds.rs

@@ -6,6 +6,7 @@ use crate::{
         ComponentDataModel, TodoSelector,
     },
     consts::{EMBED_DESCRIPTION_MAX_LENGTH, SELECT_MAX_ENTRIES, THEME_COLOR},
+    models::CtxData,
     Context, Error,
 };
 
@@ -46,7 +47,7 @@ pub async fn todo_guild_add(
 ) -> Result<(), Error> {
     sqlx::query!(
         "INSERT INTO todos (guild_id, value)
-VALUES ((SELECT id FROM guilds WHERE guild = ?), ?)",
+VALUES (?, ?)",
         ctx.guild_id().unwrap().0,
         task
     )
@@ -69,9 +70,7 @@ VALUES ((SELECT id FROM guilds WHERE guild = ?), ?)",
 )]
 pub async fn todo_guild_view(ctx: Context<'_>) -> Result<(), Error> {
     let values = sqlx::query!(
-        "SELECT todos.id, value FROM todos
+        "SELECT todos.id, value FROM todos WHERE guild_id = ?",
-INNER JOIN guilds ON todos.guild_id = guilds.id
-WHERE guilds.guild = ?",
         ctx.guild_id().unwrap().0,
     )
     .fetch_all(&ctx.data().database)
@@ -116,9 +115,12 @@ pub async fn todo_channel_add(
     ctx: Context<'_>,
     #[description = "The task to add to the todo list"] task: String,
 ) -> Result<(), Error> {
+    // ensure channel is cached
+    let _ = ctx.channel_data().await;
+
     sqlx::query!(
         "INSERT INTO todos (guild_id, channel_id, value)
-VALUES ((SELECT id FROM guilds WHERE guild = ?), (SELECT id FROM channels WHERE channel = ?), ?)",
+VALUES (?, (SELECT id FROM channels WHERE channel = ?), ?)",
         ctx.guild_id().unwrap().0,
         ctx.channel_id().0,
         task
@@ -336,7 +338,7 @@ pub fn show_todo_page(
                                 opt.create_option(|o| {
                                     o.label(format!("Mark {} complete", count + first_num))
                                         .value(id)
-                                        .description(disp.split_once(" ").unwrap_or(("", "")).1)
+                                        .description(disp.split_once(' ').unwrap_or(("", "")).1)
                                 });
                             }
 

src/component_models/mod.rs

@@ -3,13 +3,19 @@ pub(crate) mod pager;
 use std::io::Cursor;
 
 use chrono_tz::Tz;
-use poise::serenity::{
+use log::warn;
-    builder::CreateEmbed,
+use poise::{
-    client::Context,
+    serenity_prelude as serenity,
-    model::{
+    serenity_prelude::{
-        channel::Channel,
+        builder::CreateEmbed,
-        interactions::{message_component::MessageComponentInteraction, InteractionResponseType},
+        model::{
-        prelude::InteractionApplicationCommandCallbackDataFlags,
+            application::interaction::{
+                message_component::MessageComponentInteraction, InteractionResponseType,
+                MessageFlags,
+            },
+            channel::Channel,
+        },
+        Context,
     },
 };
 use rmp_serde::Serializer;
@@ -17,7 +23,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{
-        moderation_cmds::{max_macro_page, show_macro_page},
+        command_macro::list::{max_macro_page, show_macro_page},
         reminder_cmds::{max_delete_page, show_delete_page},
         todo_cmds::{max_todo_page, show_todo_page},
     },
@@ -38,6 +44,7 @@ pub enum ComponentDataModel {
     DelSelector(DelSelector),
     TodoSelector(TodoSelector),
     MacroPager(MacroPager),
+    UndoReminder(UndoReminder),
 }
 
 impl ComponentDataModel {
@@ -215,9 +222,7 @@ WHERE channels.channel = ?",
                         .collect::<Vec<(usize, String)>>()
                     } else {
                         sqlx::query!(
-                            "SELECT todos.id, value FROM todos
+                            "SELECT todos.id, value FROM todos WHERE guild_id = ?",
-INNER JOIN guilds ON todos.guild_id = guilds.id
-WHERE guilds.guild = ?",
                             pager.guild_id,
                         )
                         .fetch_all(&data.database)
@@ -253,7 +258,7 @@ WHERE guilds.guild = ?",
                             r.kind(InteractionResponseType::ChannelMessageWithSource)
                                 .interaction_response_data(|d| {
                                     d.flags(
-                                        InteractionApplicationCommandCallbackDataFlags::EPHEMERAL,
+                                        MessageFlags::EPHEMERAL,
                                     )
                                     .content("Only the user who performed the command can use these components")
                                 })
@@ -307,7 +312,7 @@ WHERE guilds.guild = ?",
                             r.kind(InteractionResponseType::ChannelMessageWithSource)
                                 .interaction_response_data(|d| {
                                     d.flags(
-                                        InteractionApplicationCommandCallbackDataFlags::EPHEMERAL,
+                                        MessageFlags::EPHEMERAL,
                                     )
                                     .content("Only the user who performed the command can use these components")
                                 })
@@ -334,6 +339,70 @@ WHERE guilds.guild = ?",
                     })
                     .await;
             }
+            ComponentDataModel::UndoReminder(undo_reminder) => {
+                if component.user.id == undo_reminder.user_id {
+                    let reminder =
+                        Reminder::from_id(&data.database, undo_reminder.reminder_id).await;
+
+                    if let Some(reminder) = reminder {
+                        match reminder.delete(&data.database).await {
+                            Ok(()) => {
+                                let _ = component
+                                    .create_interaction_response(&ctx, |f| {
+                                        f.kind(InteractionResponseType::UpdateMessage)
+                                            .interaction_response_data(|d| {
+                                                d.embed(|e| {
+                                                    e.title("Reminder Canceled")
+                                                        .description(
+                                                            "This reminder has been canceled.",
+                                                        )
+                                                        .color(*THEME_COLOR)
+                                                })
+                                                .components(|c| c)
+                                            })
+                                    })
+                                    .await;
+                            }
+                            Err(e) => {
+                                warn!("Error canceling reminder: {:?}", e);
+
+                                let _ = component
+                                    .create_interaction_response(&ctx, |f| {
+                                        f.kind(InteractionResponseType::ChannelMessageWithSource)
+                                            .interaction_response_data(|d| {
+                                                d.content(
+                                                    "The reminder could not be canceled: it may have already been deleted. Check `/del`!")
+                                                    .ephemeral(true)
+                                            })
+                                    })
+                                    .await;
+                            }
+                        }
+                    } else {
+                        let _ = component
+                            .create_interaction_response(&ctx, |f| {
+                                f.kind(InteractionResponseType::ChannelMessageWithSource)
+                                    .interaction_response_data(|d| {
+                                        d.content(
+                                            "The reminder could not be canceled: it may have already been deleted. Check `/del`!")
+                                            .ephemeral(true)
+                                    })
+                            })
+                            .await;
+                    }
+                } else {
+                    let _ = component
+                        .create_interaction_response(&ctx, |f| {
+                            f.kind(InteractionResponseType::ChannelMessageWithSource)
+                                .interaction_response_data(|d| {
+                                    d.content(
+                                        "Only the user who performed the command can use this button.")
+                                        .ephemeral(true)
+                                })
+                        })
+                        .await;
+                }
+            }
         }
     }
 }
@@ -351,3 +420,9 @@ pub struct TodoSelector {
     pub channel_id: Option<u64>,
     pub guild_id: Option<u64>,
 }
+
+#[derive(Serialize, Deserialize)]
+pub struct UndoReminder {
+    pub user_id: serenity::UserId,
+    pub reminder_id: u32,
+}

src/component_models/pager.rs

@@ -1,7 +1,7 @@
 // todo split pager out into a single struct
 use chrono_tz::Tz;
-use poise::serenity::{
+use poise::serenity_prelude::{
-    builder::CreateComponents, model::interactions::message_component::ButtonStyle,
+    builder::CreateComponents, model::application::component::ButtonStyle,
 };
 use serde::{Deserialize, Serialize};
 use serde_repr::*;

src/consts.rs

@@ -2,7 +2,7 @@ pub const DAY: u64 = 86_400;
 pub const HOUR: u64 = 3_600;
 pub const MINUTE: u64 = 60;
 
-pub const EMBED_DESCRIPTION_MAX_LENGTH: usize = 4000;
+pub const EMBED_DESCRIPTION_MAX_LENGTH: usize = 4096;
 pub const SELECT_MAX_ENTRIES: usize = 25;
 
 pub const CHARACTERS: &str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
@@ -12,7 +12,7 @@ pub const MACRO_MAX_COMMANDS: usize = 5;
 
 use std::{collections::HashSet, env, iter::FromIterator};
 
-use poise::serenity::model::prelude::AttachmentType;
+use poise::serenity_prelude::model::prelude::AttachmentType;
 use regex::Regex;
 
 lazy_static! {
@@ -36,15 +36,11 @@ lazy_static! {
     );
     pub static ref CNC_GUILD: Option<u64> =
         env::var("CNC_GUILD").map(|var| var.parse::<u64>().ok()).ok().flatten();
-    pub static ref MIN_INTERVAL: i64 = env::var("MIN_INTERVAL")
+    pub static ref MIN_INTERVAL: i64 =
-        .ok()
+        env::var("MIN_INTERVAL").ok().and_then(|inner| inner.parse::<i64>().ok()).unwrap_or(600);
-        .map(|inner| inner.parse::<i64>().ok())
-        .flatten()
-        .unwrap_or(600);
     pub static ref MAX_TIME: i64 = env::var("MAX_TIME")
         .ok()
-        .map(|inner| inner.parse::<i64>().ok())
+        .and_then(|inner| inner.parse::<i64>().ok())
-        .flatten()
         .unwrap_or(60 * 60 * 24 * 365 * 50);
     pub static ref LOCAL_TIMEZONE: String =
         env::var("LOCAL_TIMEZONE").unwrap_or_else(|_| "UTC".to_string());

src/event_handlers.rs

@@ -1,12 +1,14 @@
-use std::{collections::HashMap, env, sync::atomic::Ordering};
+use std::{collections::HashMap, env};
 
-use log::{error, info, warn};
+use log::error;
 use poise::{
-    serenity::{model::interactions::Interaction, utils::shard_id},
     serenity_prelude as serenity,
+    serenity_prelude::{model::application::interaction::Interaction, utils::shard_id},
 };
 
-use crate::{component_models::ComponentDataModel, Data, Error};
+use crate::{
+    component_models::ComponentDataModel, models::guild_data::GuildData, Data, Error, THEME_COLOR,
+};
 
 pub async fn listener(
     ctx: &serenity::Context,
@@ -14,44 +16,8 @@ pub async fn listener(
     data: &Data,
 ) -> Result<(), Error> {
     match event {
-        poise::Event::CacheReady { .. } => {
+        poise::Event::Ready { .. } => {
-            info!("Cache Ready! Preparing extra processes");
+            ctx.set_activity(serenity::Activity::watching("for /remind")).await;
-
-            if !data.is_loop_running.load(Ordering::Relaxed) {
-                let kill_tx = data.broadcast.clone();
-                let kill_recv = data.broadcast.subscribe();
-
-                let ctx1 = ctx.clone();
-                let ctx2 = ctx.clone();
-
-                let pool1 = data.database.clone();
-                let pool2 = data.database.clone();
-
-                let run_settings = env::var("DONTRUN").unwrap_or_else(|_| "".to_string());
-
-                if !run_settings.contains("postman") {
-                    tokio::spawn(async move {
-                        match postman::initialize(kill_recv, ctx1, &pool1).await {
-                            Ok(_) => {}
-                            Err(e) => {
-                                error!("postman exiting: {}", e);
-                            }
-                        };
-                    });
-                } else {
-                    warn!("Not running postman")
-                }
-
-                if !run_settings.contains("web") {
-                    tokio::spawn(async move {
-                        reminder_web::initialize(kill_tx, ctx2, pool2).await.unwrap();
-                    });
-                } else {
-                    warn!("Not running web")
-                }
-
-                data.is_loop_running.swap(true, Ordering::Relaxed);
-            }
         }
         poise::Event::ChannelDelete { channel } => {
             sqlx::query!("DELETE FROM channels WHERE channel = ?", channel.id.as_u64())
@@ -63,64 +29,100 @@ pub async fn listener(
             if *is_new {
                 let guild_id = guild.id.as_u64().to_owned();
 
-                sqlx::query!("INSERT INTO guilds (guild) VALUES (?)", guild_id)
+                sqlx::query!("INSERT IGNORE INTO guilds (id) VALUES (?)", guild_id)
                     .execute(&data.database)
-                    .await
+                    .await?;
-                    .unwrap();
 
-                if let Ok(token) = env::var("DISCORDBOTS_TOKEN") {
+                if let Err(e) = post_guild_count(ctx, &data.http, guild_id).await {
-                    let shard_count = ctx.cache.shard_count();
+                    error!("DiscordBotList: {:?}", e);
-                    let current_shard_id = shard_id(guild_id, shard_count);
+                }
 
-                    let guild_count = ctx
+                let default_channel = guild.default_channel_guaranteed();
-                        .cache
+
-                        .guilds()
+                if let Some(default_channel) = default_channel {
-                        .iter()
+                    default_channel
-                        .filter(|g| {
+                        .send_message(&ctx, |m| {
-                            shard_id(g.as_u64().to_owned(), shard_count) == current_shard_id
+                            m.embed(|e| {
+                                e.title("Thank you for adding Reminder Bot!").description(
+                                    "To get started:
+• Set your timezone with `/timezone`
+• Set up permissions in Server Settings 🠚 Integrations 🠚 Reminder Bot (desktop only)
+• Create your first reminder with `/remind`
+
+__Support__
+If you need any support, please come and ask us! Join our [Discord](https://discord.jellywx.com).
+
+__Updates__
+To stay up to date on the latest features and fixes, join our [Discord](https://discord.jellywx.com).
+",
+                                ).color(*THEME_COLOR)
+                            })
                         })
-                        .count() as u64;
+                        .await?;
-
-                    let mut hm = HashMap::new();
-                    hm.insert("server_count", guild_count);
-                    hm.insert("shard_id", current_shard_id);
-                    hm.insert("shard_count", shard_count);
-
-                    let response = data
-                        .http
-                        .post(
-                            format!(
-                                "https://top.gg/api/bots/{}/stats",
-                                ctx.cache.current_user_id().as_u64()
-                            )
-                            .as_str(),
-                        )
-                        .header("Authorization", token)
-                        .json(&hm)
-                        .send()
-                        .await;
-
-                    if let Err(res) = response {
-                        println!("DiscordBots Response: {:?}", res);
-                    }
                 }
             }
         }
         poise::Event::GuildDelete { incomplete, .. } => {
-            let _ = sqlx::query!("DELETE FROM guilds WHERE guild = ?", incomplete.id.0)
+            let _ = sqlx::query!("DELETE FROM guilds WHERE id = ?", incomplete.id.0)
                 .execute(&data.database)
                 .await;
         }
-        poise::Event::InteractionCreate { interaction } => match interaction {
+        poise::Event::InteractionCreate { interaction } => {
-            Interaction::MessageComponent(component) => {
+            match interaction {
-                let component_model = ComponentDataModel::from_custom_id(&component.data.custom_id);
+                Interaction::ApplicationCommand(app_command) => {
+                    if let Some(guild_id) = app_command.guild_id {
+                        // check database guild exists
+                        GuildData::from_guild(guild_id, &data.database).await?;
+                    }
+                }
 
-                component_model.act(ctx, data, component).await;
+                Interaction::MessageComponent(component) => {
+                    let component_model =
+                        ComponentDataModel::from_custom_id(&component.data.custom_id);
+
+                    component_model.act(ctx, data, component).await;
+                }
+
+                _ => {}
             }
-            _ => {}
+        }
-        },
         _ => {}
     }
 
     Ok(())
 }
+
+async fn post_guild_count(
+    ctx: &serenity::Context,
+    http: &reqwest::Client,
+    guild_id: u64,
+) -> Result<(), reqwest::Error> {
+    if let Ok(token) = env::var("DISCORDBOTS_TOKEN") {
+        let shard_count = ctx.cache.shard_count();
+        let current_shard_id = shard_id(guild_id, shard_count);
+
+        let guild_count = ctx
+            .cache
+            .guilds()
+            .iter()
+            .filter(|g| shard_id(g.as_u64().to_owned(), shard_count) == current_shard_id)
+            .count() as u64;
+
+        let mut hm = HashMap::new();
+        hm.insert("server_count", guild_count);
+        hm.insert("shard_id", current_shard_id);
+        hm.insert("shard_count", shard_count);
+
+        http.post(
+            format!("https://top.gg/api/bots/{}/stats", ctx.cache.current_user_id().as_u64())
+                .as_str(),
+        )
+        .header("Authorization", token)
+        .json(&hm)
+        .send()
+        .await
+        .map(|_| ())
+    } else {
+        Ok(())
+    }
+}

src/hooks.rs

@@ -1,48 +1,48 @@
-use poise::serenity::model::channel::Channel;
+use poise::{
+    serenity_prelude::model::channel::Channel, ApplicationCommandOrAutocompleteInteraction,
+};
 
 use crate::{consts::MACRO_MAX_COMMANDS, models::command_macro::RecordedCommand, Context, Error};
 
 async fn macro_check(ctx: Context<'_>) -> bool {
     if let Context::Application(app_ctx) = ctx {
-        if let Some(guild_id) = ctx.guild_id() {
+        if let ApplicationCommandOrAutocompleteInteraction::ApplicationCommand(_) =
-            if ctx.command().identifying_name != "finish_macro" {
+            app_ctx.interaction
-                let mut lock = ctx.data().recording_macros.write().await;
+        {
+            if let Some(guild_id) = ctx.guild_id() {
+                if ctx.command().identifying_name != "finish_macro" {
+                    let mut lock = ctx.data().recording_macros.write().await;
 
-                if let Some(command_macro) = lock.get_mut(&(guild_id, ctx.author().id)) {
+                    if let Some(command_macro) = lock.get_mut(&(guild_id, ctx.author().id)) {
-                    if command_macro.commands.len() >= MACRO_MAX_COMMANDS {
+                        if command_macro.commands.len() >= MACRO_MAX_COMMANDS {
-                        let _ = ctx.send(|m| {
+                            let _ = ctx.send(|m| {
-                                m.ephemeral(true).content(
+                            m.ephemeral(true).content(
-                                    format!("{} commands already recorded. Please use `/macro finish` to end recording.", MACRO_MAX_COMMANDS),
+                                format!("{} commands already recorded. Please use `/macro finish` to end recording.", MACRO_MAX_COMMANDS),
-                                )
+                            )
-                            })
+                        })
                             .await;
-                    } else {
+                        } else {
-                        let recorded = RecordedCommand {
+                            let recorded = RecordedCommand {
-                            action: None,
+                                action: None,
-                            command_name: ctx.command().identifying_name.clone(),
+                                command_name: ctx.command().identifying_name.clone(),
-                            options: Vec::from(app_ctx.args),
+                                options: Vec::from(app_ctx.args),
-                        };
+                            };
 
-                        command_macro.commands.push(recorded);
+                            command_macro.commands.push(recorded);
 
-                        let _ = ctx
+                            let _ = ctx
-                            .send(|m| m.ephemeral(true).content("Command recorded to macro"))
+                                .send(|m| m.ephemeral(true).content("Command recorded to macro"))
-                            .await;
+                                .await;
+                        }
+
+                        return false;
                     }
-
-                    false
-                } else {
-                    true
                 }
-            } else {
-                true
             }
-        } else {
-            true
         }
-    } else {
-        true
     }
+
+    true
 }
 
 async fn check_self_permissions(ctx: Context<'_>) -> bool {
@@ -56,14 +56,13 @@ async fn check_self_permissions(ctx: Context<'_>) -> bool {
         let (view_channel, send_messages, embed_links) = ctx
             .channel_id()
             .to_channel_cached(&ctx.discord())
-            .map(|c| {
+            .and_then(|c| {
                 if let Channel::Guild(channel) = c {
                     channel.permissions_for_user(&ctx.discord(), user_id).ok()
                 } else {
                     None
                 }
             })
-            .flatten()
             .map_or((false, false, false), |p| {
                 (p.view_channel(), p.send_messages(), p.embed_links())
             });

src/interval_parser.rs

@@ -75,7 +75,7 @@ impl fmt::Display for Error {
         match self {
             Error::InvalidCharacter(offset) => write!(f, "invalid character at {}", offset),
             Error::NumberExpected(offset) => write!(f, "expected number at {}", offset),
-            Error::UnknownUnit { unit, value, .. } if &unit == &"" => {
+            Error::UnknownUnit { unit, value, .. } if unit.is_empty() => {
                 write!(f, "time unit needed, for example {0}sec or {0}ms", value,)
             }
             Error::UnknownUnit { unit, .. } => {
@@ -162,11 +162,11 @@ impl<'a> Parser<'a> {
         };
         let mut nsec = self.current.2 + nsec;
         if nsec > 1_000_000_000 {
-            sec = sec + nsec / 1_000_000_000;
+            sec += nsec / 1_000_000_000;
             nsec %= 1_000_000_000;
         }
-        sec = self.current.1 + sec;
+        sec += self.current.1;
-        month = self.current.0 + month;
+        month += self.current.0;
 
         self.current = (month, sec, nsec);
 

src/main.rs

@@ -1,4 +1,5 @@
 #![feature(int_roundings)]
+
 #[macro_use]
 extern crate lazy_static;
 
@@ -17,20 +18,20 @@ use std::{
     env,
     error::Error as StdError,
     fmt::{Debug, Display, Formatter},
-    sync::atomic::AtomicBool,
 };
 
 use chrono_tz::Tz;
 use dotenv::dotenv;
-use poise::serenity::model::{
+use log::{error, warn};
-    gateway::{Activity, GatewayIntents},
+use poise::serenity_prelude::model::{
+    gateway::GatewayIntents,
     id::{GuildId, UserId},
 };
 use sqlx::{MySql, Pool};
 use tokio::sync::{broadcast, broadcast::Sender, RwLock};
 
 use crate::{
-    commands::{info_cmds, moderation_cmds, reminder_cmds, todo_cmds},
+    commands::{command_macro, info_cmds, moderation_cmds, reminder_cmds, todo_cmds},
     consts::THEME_COLOR,
     event_handlers::listener,
     hooks::all_checks,
@@ -42,17 +43,17 @@ type Database = MySql;
 
 type Error = Box<dyn std::error::Error + Send + Sync>;
 type Context<'a> = poise::Context<'a, Data, Error>;
+type ApplicationContext<'a> = poise::ApplicationContext<'a, Data, Error>;
 
 pub struct Data {
     database: Pool<Database>,
     http: reqwest::Client,
     recording_macros: RwLock<HashMap<(GuildId, UserId), CommandMacro<Data, Error>>>,
     popular_timezones: Vec<Tz>,
-    is_loop_running: AtomicBool,
+    _broadcast: Sender<()>,
-    broadcast: Sender<()>,
 }
 
-impl std::fmt::Debug for Data {
+impl Debug for Data {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         write!(f, "Data {{ .. }}")
     }
@@ -102,13 +103,26 @@ async fn _main(tx: Sender<()>) -> Result<(), Box<dyn StdError + Send + Sync>> {
             moderation_cmds::timezone(),
             poise::Command {
                 subcommands: vec![
-                    moderation_cmds::delete_macro(),
+                    moderation_cmds::set_allowed_dm(),
-                    moderation_cmds::finish_macro(),
+                    moderation_cmds::unset_allowed_dm(),
-                    moderation_cmds::list_macro(),
-                    moderation_cmds::record_macro(),
-                    moderation_cmds::run_macro(),
                 ],
-                ..moderation_cmds::macro_base()
+                ..moderation_cmds::allowed_dm()
+            },
+            moderation_cmds::webhook(),
+            poise::Command {
+                subcommands: vec![
+                    command_macro::delete::delete_macro(),
+                    command_macro::record::finish_macro(),
+                    command_macro::list::list_macro(),
+                    command_macro::record::record_macro(),
+                    command_macro::run::run_macro(),
+                    command_macro::migrate::migrate_macro(),
+                ],
+                ..command_macro::macro_base()
+            },
+            poise::Command {
+                subcommands: vec![moderation_cmds::default_channel()],
+                ..moderation_cmds::default()
             },
             reminder_cmds::pause(),
             reminder_cmds::offset(),
@@ -158,7 +172,12 @@ async fn _main(tx: Sender<()>) -> Result<(), Box<dyn StdError + Send + Sync>> {
         Pool::connect(&env::var("DATABASE_URL").expect("No database URL provided")).await.unwrap();
 
     let popular_timezones = sqlx::query!(
-        "SELECT timezone FROM users GROUP BY timezone ORDER BY COUNT(timezone) DESC LIMIT 21"
+        "SELECT IFNULL(timezone, 'UTC') AS timezone
+        FROM users
+        WHERE timezone IS NOT NULL
+        GROUP BY timezone
+        ORDER BY COUNT(timezone) DESC
+        LIMIT 21"
     )
     .fetch_all(&database)
     .await
@@ -167,29 +186,50 @@ async fn _main(tx: Sender<()>) -> Result<(), Box<dyn StdError + Send + Sync>> {
     .map(|t| t.timezone.parse::<Tz>().unwrap())
     .collect::<Vec<Tz>>();
 
-    poise::Framework::build()
+    poise::Framework::builder()
         .token(discord_token)
         .user_data_setup(move |ctx, _bot, framework| {
             Box::pin(async move {
-                ctx.set_activity(Activity::watching("for /remind")).await;
+                register_application_commands(ctx, framework, None).await.unwrap();
 
-                register_application_commands(
+                let kill_tx = tx.clone();
-                    ctx,
+                let kill_recv = tx.subscribe();
-                    framework,
+
-                    env::var("DEBUG_GUILD")
+                let ctx1 = ctx.clone();
-                        .map(|inner| GuildId(inner.parse().expect("DEBUG_GUILD not valid")))
+                let ctx2 = ctx.clone();
-                        .ok(),
+
-                )
+                let pool1 = database.clone();
-                .await
+                let pool2 = database.clone();
-                .unwrap();
+
+                let run_settings = env::var("DONTRUN").unwrap_or_else(|_| "".to_string());
+
+                if !run_settings.contains("postman") {
+                    tokio::spawn(async move {
+                        match postman::initialize(kill_recv, ctx1, &pool1).await {
+                            Ok(_) => {}
+                            Err(e) => {
+                                error!("postman exiting: {}", e);
+                            }
+                        };
+                    });
+                } else {
+                    warn!("Not running postman");
+                }
+
+                if !run_settings.contains("web") {
+                    tokio::spawn(async move {
+                        reminder_web::initialize(kill_tx, ctx2, pool2).await.unwrap();
+                    });
+                } else {
+                    warn!("Not running web");
+                }
 
                 Ok(Data {
                     http: reqwest::Client::new(),
                     database,
                     popular_timezones,
                     recording_macros: Default::default(),
-                    is_loop_running: AtomicBool::new(false),
+                    _broadcast: tx,
-                    broadcast: tx,
                 })
             })
         })

src/models/channel_data.rs

@@ -1,5 +1,5 @@
 use chrono::NaiveDateTime;
-use poise::serenity::model::channel::Channel;
+use poise::serenity_prelude::model::channel::Channel;
 use sqlx::MySqlPool;
 
 pub struct ChannelData {
@@ -38,7 +38,7 @@ SELECT id, name, nudge, blacklisted, webhook_id, webhook_token, paused, paused_u
 
             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 (?, ?, ?)
                 ",
                 channel_id,
                 channel_name,

src/models/command_macro.rs

@@ -1,15 +1,16 @@
-use poise::serenity::model::{
+use poise::serenity_prelude::model::{
-    id::GuildId, interactions::application_command::ApplicationCommandInteractionDataOption,
+    application::interaction::application_command::CommandDataOption, id::GuildId,
 };
 use serde::{Deserialize, Serialize};
+use serde_json::Value;
 
 use crate::{Context, Data, Error};
 
-fn default_none<U, E>() -> Option<
+type Func<U, E> = for<'a> fn(
-    for<'a> fn(
+    poise::ApplicationContext<'a, U, E>,
-        poise::ApplicationContext<'a, U, E>,
+) -> poise::BoxFuture<'a, Result<(), poise::FrameworkError<'a, U, E>>>;
-    ) -> poise::BoxFuture<'a, Result<(), poise::FrameworkError<'a, U, E>>>,
+
-> {
+fn default_none<U, E>() -> Option<Func<U, E>> {
     None
 }
 
@@ -17,13 +18,9 @@ fn default_none<U, E>() -> Option<
 pub struct RecordedCommand<U, E> {
     #[serde(skip)]
     #[serde(default = "default_none::<U, E>")]
-    pub action: Option<
+    pub action: Option<Func<U, E>>,
-        for<'a> fn(
-            poise::ApplicationContext<'a, U, E>,
-        ) -> poise::BoxFuture<'a, Result<(), poise::FrameworkError<'a, U, E>>>,
-    >,
     pub command_name: String,
-    pub options: Vec<ApplicationCommandInteractionDataOption>,
+    pub options: Vec<CommandDataOption>,
 }
 
 pub struct CommandMacro<U, E> {
@@ -33,13 +30,20 @@ pub struct CommandMacro<U, E> {
     pub commands: Vec<RecordedCommand<U, E>>,
 }
 
+pub struct RawCommandMacro {
+    pub guild_id: GuildId,
+    pub name: String,
+    pub description: Option<String>,
+    pub commands: Value,
+}
+
 pub async fn guild_command_macro(
     ctx: &Context<'_>,
     name: &str,
 ) -> Option<CommandMacro<Data, Error>> {
     let row = sqlx::query!(
         "
-SELECT * FROM macro WHERE guild_id = (SELECT id FROM guilds WHERE guild = ?) AND name = ?
+SELECT * FROM macro WHERE guild_id = ? AND name = ?
         ",
         ctx.guild_id().unwrap().0,
         name
@@ -59,7 +63,7 @@ SELECT * FROM macro WHERE guild_id = (SELECT id FROM guilds WHERE guild = ?) AND
             .iter()
             .find(|c| c.identifying_name == recorded_command.command_name);
 
-        recorded_command.action = command.map(|c| c.slash_action).flatten().clone();
+        recorded_command.action = command.map(|c| c.slash_action).flatten();
     }
 
     let command_macro = CommandMacro {

src/models/guild_data.rs

@@ -0,0 +1,52 @@
+use sqlx::MySqlPool;
+
+use crate::GuildId;
+
+pub struct GuildData {
+    pub id: u64,
+    pub default_channel: Option<u64>,
+}
+
+impl GuildData {
+    pub async fn from_guild(guild: GuildId, pool: &MySqlPool) -> Result<Self, sqlx::Error> {
+        let guild_id = guild.0;
+
+        if let Ok(row) = sqlx::query_as_unchecked!(
+            Self,
+            "
+SELECT id, default_channel FROM guilds WHERE id = ?
+            ",
+            guild_id
+        )
+        .fetch_one(pool)
+        .await
+        {
+            Ok(row)
+        } else {
+            sqlx::query!(
+                "
+INSERT IGNORE INTO guilds (id) VALUES (?)
+                ",
+                guild_id
+            )
+            .execute(&pool.clone())
+            .await?;
+
+            Ok(Self { id: guild_id, default_channel: None })
+        }
+    }
+
+    pub async fn commit_changes(&self, pool: &MySqlPool) -> Result<(), sqlx::Error> {
+        sqlx::query!(
+            "
+UPDATE guilds SET default_channel = ? WHERE id = ?
+            ",
+            self.default_channel,
+            self.id
+        )
+        .execute(pool)
+        .await?;
+
+        Ok(())
+    }
+}

src/models/mod.rs

@@ -1,28 +1,28 @@
 pub mod channel_data;
 pub mod command_macro;
+pub mod guild_data;
 pub mod reminder;
 pub mod timer;
 pub mod user_data;
 
 use chrono_tz::Tz;
-use poise::serenity::{async_trait, model::id::UserId};
+use log::warn;
+use poise::serenity_prelude::{async_trait, model::id::UserId, ChannelId};
 
 use crate::{
-    models::{channel_data::ChannelData, user_data::UserData},
+    models::{channel_data::ChannelData, guild_data::GuildData, user_data::UserData},
     CommandMacro, Context, Data, Error, GuildId,
 };
 
 #[async_trait]
 pub trait CtxData {
     async fn user_data<U: Into<UserId> + Send>(&self, user_id: U) -> Result<UserData, Error>;
-
     async fn author_data(&self) -> Result<UserData, Error>;
-
     async fn timezone(&self) -> Tz;
-
     async fn channel_data(&self) -> Result<ChannelData, Error>;
-
+    async fn guild_data(&self) -> Option<GuildData>;
     async fn command_macros(&self) -> Result<Vec<CommandMacro<Data, Error>>, Error>;
+    async fn default_channel(&self) -> Option<ChannelId>;
 }
 
 #[async_trait]
@@ -51,24 +51,55 @@ impl CtxData for Context<'_> {
     async fn command_macros(&self) -> Result<Vec<CommandMacro<Data, Error>>, Error> {
         self.data().command_macros(self.guild_id().unwrap()).await
     }
+
+    async fn default_channel(&self) -> Option<ChannelId> {
+        match self.guild_id() {
+            Some(guild_id) => {
+                let guild_data = GuildData::from_guild(guild_id, &self.data().database).await;
+
+                match guild_data {
+                    Ok(data) => data.default_channel.map(|c| ChannelId(c)),
+
+                    Err(e) => {
+                        warn!("SQL error: {:?}", e);
+
+                        None
+                    }
+                }
+            }
+
+            None => None,
+        }
+    }
+
+    async fn guild_data(&self) -> Option<GuildData> {
+        match self.guild_id() {
+            Some(guild_id) => GuildData::from_guild(guild_id, &self.data().database).await.ok(),
+
+            None => None,
+        }
+    }
 }
 
 impl Data {
-    pub(crate) async fn command_macros(
+    pub async fn command_macros(
         &self,
         guild_id: GuildId,
     ) -> Result<Vec<CommandMacro<Data, Error>>, Error> {
         let rows = sqlx::query!(
-            "SELECT name, description, commands FROM macro WHERE guild_id = (SELECT id FROM guilds WHERE guild = ?)",
+            "SELECT name, description, commands FROM macro WHERE guild_id = ?",
             guild_id.0
         )
         .fetch_all(&self.database)
-        .await?.iter().map(|row| CommandMacro {
+        .await?
+        .iter()
+        .map(|row| CommandMacro {
             guild_id,
             name: row.name.clone(),
             description: row.description.clone(),
             commands: serde_json::from_str(&row.commands).unwrap(),
-        }).collect();
+        })
+        .collect();
 
         Ok(rows)
     }

src/models/reminder/builder.rs

@@ -2,7 +2,7 @@ use std::{collections::HashSet, fmt::Display};
 
 use chrono::{Duration, NaiveDateTime, Utc};
 use chrono_tz::Tz;
-use poise::serenity::{
+use poise::serenity_prelude::{
     http::CacheHttp,
     model::{
         channel::GuildChannel,
@@ -126,7 +126,7 @@ INSERT INTO reminders (
                     .await
                     .unwrap();
 
-                    Ok(Reminder::from_uid(&self.pool, self.uid).await.unwrap())
+                    Ok(Reminder::from_uid(&self.pool, &self.uid).await.unwrap())
                 }
             }
 
@@ -207,7 +207,7 @@ impl<'a> MultiReminderBuilder<'a> {
         self.scopes = scopes;
     }
 
-    pub async fn build(self) -> (HashSet<ReminderError>, HashSet<ReminderScope>) {
+    pub async fn build(self) -> (HashSet<ReminderError>, HashSet<(Reminder, ReminderScope)>) {
         let mut errors = HashSet::new();
 
         let mut ok_locs = HashSet::new();
@@ -233,6 +233,10 @@ impl<'a> MultiReminderBuilder<'a> {
                             if let Some(guild_id) = self.guild_id {
                                 if guild_id.member(&self.ctx.discord(), user).await.is_err() {
                                     Err(ReminderError::InvalidTag)
+                                } else if self.set_by.map_or(true, |i| i != user_data.id)
+                                    && !user_data.allowed_dm
+                                {
+                                    Err(ReminderError::UserBlockedDm)
                                 } else {
                                     Ok(user_data.dm_channel)
                                 }
@@ -309,8 +313,8 @@ impl<'a> MultiReminderBuilder<'a> {
                         };
 
                         match builder.build().await {
-                            Ok(_) => {
+                            Ok(r) => {
-                                ok_locs.insert(scope);
+                                ok_locs.insert((r, scope));
                             }
                             Err(e) => {
                                 errors.insert(e);

src/models/reminder/errors.rs

@@ -7,6 +7,7 @@ pub enum ReminderError {
     PastTime,
     ShortInterval,
     InvalidTag,
+    UserBlockedDm,
     DiscordError(String),
 }
 
@@ -30,6 +31,9 @@ impl ToString for ReminderError {
             ReminderError::InvalidTag => {
                 "Couldn't find a location by your tag. Your tag must be either a channel or a user (not a role)".to_string()
             }
+            ReminderError::UserBlockedDm => {
+                "User has DM reminders disabled".to_string()
+            }
             ReminderError::DiscordError(s) => format!("A Discord error occurred: **{}**", s),
         }
     }

src/models/reminder/look_flags.rs

@@ -1,4 +1,4 @@
-use poise::serenity::model::id::ChannelId;
+use poise::serenity_prelude::model::id::ChannelId;
 use serde::{Deserialize, Serialize};
 use serde_repr::*;
 

src/models/reminder/mod.rs

@@ -4,11 +4,13 @@ pub mod errors;
 mod helper;
 pub mod look_flags;
 
+use std::hash::{Hash, Hasher};
+
 use chrono::{NaiveDateTime, TimeZone};
 use chrono_tz::Tz;
-use poise::{
+use poise::serenity_prelude::{
-    serenity::model::id::{ChannelId, GuildId, UserId},
+    model::id::{ChannelId, GuildId, UserId},
-    serenity_prelude::Cache,
+    Cache,
 };
 use sqlx::Executor;
 
@@ -32,11 +34,22 @@ pub struct Reminder {
     pub set_by: Option<u64>,
 }
 
+impl Hash for Reminder {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.uid.hash(state);
+    }
+}
+
+impl PartialEq<Self> for Reminder {
+    fn eq(&self, other: &Self) -> bool {
+        self.uid == other.uid
+    }
+}
+
+impl Eq for Reminder {}
+
 impl Reminder {
-    pub async fn from_uid(
+    pub async fn from_uid(pool: impl Executor<'_, Database = Database>, uid: &str) -> Option<Self> {
-        pool: impl Executor<'_, Database = Database>,
-        uid: String,
-    ) -> Option<Self> {
         sqlx::query_as_unchecked!(
             Self,
             "
@@ -72,6 +85,42 @@ WHERE
         .ok()
     }
 
+    pub async fn from_id(pool: impl Executor<'_, Database = Database>, id: u32) -> Option<Self> {
+        sqlx::query_as_unchecked!(
+            Self,
+            "
+SELECT
+    reminders.id,
+    reminders.uid,
+    channels.channel,
+    reminders.utc_time,
+    reminders.interval_seconds,
+    reminders.interval_months,
+    reminders.expires,
+    reminders.enabled,
+    reminders.content,
+    reminders.embed_description,
+    users.user AS set_by
+FROM
+    reminders
+INNER JOIN
+    channels
+ON
+    reminders.channel_id = channels.id
+LEFT JOIN
+    users
+ON
+    reminders.set_by = users.id
+WHERE
+    reminders.id = ?
+            ",
+            id
+        )
+        .fetch_one(pool)
+        .await
+        .ok()
+    }
+
     pub async fn from_channel<C: Into<ChannelId>>(
         pool: impl Executor<'_, Database = Database>,
         channel_id: C,
@@ -196,7 +245,7 @@ LEFT JOIN
 ON
     reminders.set_by = users.id
 WHERE
-    channels.guild_id = (SELECT id FROM guilds WHERE guild = ?)
+    channels.guild_id = ?
                 ",
                     guild_id.as_u64()
                 )
@@ -240,6 +289,13 @@ WHERE
         .unwrap()
     }
 
+    pub async fn delete(
+        &self,
+        db: impl Executor<'_, Database = Database>,
+    ) -> Result<(), sqlx::Error> {
+        sqlx::query!("DELETE FROM reminders WHERE uid = ?", self.uid).execute(db).await.map(|_| ())
+    }
+
     pub fn display_content(&self) -> &str {
         if self.content.is_empty() {
             &self.embed_description
@@ -254,10 +310,7 @@ WHERE
             count + 1,
             self.display_content(),
             self.channel,
-            timezone
+            timezone.timestamp(self.utc_time.timestamp(), 0).format("%Y-%m-%d %H:%M:%S")
-                .timestamp(self.utc_time.timestamp(), 0)
-                .format("%Y-%m-%d %H:%M:%S")
-                .to_string()
         )
     }
 

src/models/user_data.rs

@@ -1,6 +1,6 @@
 use chrono_tz::Tz;
 use log::error;
-use poise::serenity::{http::CacheHttp, model::id::UserId};
+use poise::serenity_prelude::{http::CacheHttp, model::id::UserId};
 use sqlx::MySqlPool;
 
 use crate::consts::LOCAL_TIMEZONE;
@@ -10,6 +10,7 @@ pub struct UserData {
     pub user: u64,
     pub dm_channel: u32,
     pub timezone: String,
+    pub allowed_dm: bool,
 }
 
 impl UserData {
@@ -21,7 +22,7 @@ impl UserData {
 
         match sqlx::query!(
             "
-SELECT timezone FROM users WHERE user = ?
+SELECT IFNULL(timezone, 'UTC') AS timezone FROM users WHERE user = ?
             ",
             user_id
         )
@@ -46,7 +47,7 @@ SELECT timezone FROM users WHERE user = ?
         match sqlx::query_as_unchecked!(
             Self,
             "
-SELECT id, user, dm_channel, IF(timezone IS NULL, ?, timezone) AS timezone FROM users WHERE user = ?
+SELECT id, user, dm_channel, IF(timezone IS NULL, ?, timezone) AS timezone, allowed_dm FROM users WHERE user = ?
             ",
             *LOCAL_TIMEZONE,
             user_id.0
@@ -71,7 +72,7 @@ INSERT IGNORE INTO channels (channel) VALUES (?)
 
                 sqlx::query!(
                     "
-INSERT INTO users (user, dm_channel, timezone) VALUES (?, (SELECT id FROM channels WHERE channel = ?), ?)
+INSERT INTO users (name, user, dm_channel, timezone) VALUES ('', ?, (SELECT id FROM channels WHERE channel = ?), ?)
                     ",
                     user_id.0,
                     dm_channel.id.0,
@@ -83,7 +84,7 @@ INSERT INTO users (user, dm_channel, timezone) VALUES (?, (SELECT id FROM channe
                 Ok(sqlx::query_as_unchecked!(
                     Self,
                     "
-SELECT id, user, dm_channel, timezone FROM users WHERE user = ?
+SELECT id, user, dm_channel, timezone, allowed_dm FROM users WHERE user = ?
                     ",
                     user_id.0
                 )
@@ -102,9 +103,10 @@ SELECT id, user, dm_channel, timezone FROM users WHERE user = ?
     pub async fn commit_changes(&self, pool: &MySqlPool) {
         sqlx::query!(
             "
-UPDATE users SET timezone = ? WHERE id = ?
+UPDATE users SET timezone = ?, allowed_dm = ? WHERE id = ?
             ",
             self.timezone,
+            self.allowed_dm,
             self.id
         )
         .execute(pool)

src/time_parser.rs

@@ -211,14 +211,12 @@ pub async fn natural_parser(time: &str, timezone: &str) -> Option<i64> {
         .output()
         .await
         .ok()
-        .map(|inner| {
+        .and_then(|inner| {
             if inner.status.success() {
                 Some(from_utf8(&*inner.stdout).unwrap().parse::<i64>().unwrap())
             } else {
                 None
             }
         })
-        .flatten()
+        .and_then(|inner| if inner < 0 { None } else { Some(inner) })
-        .map(|inner| if inner < 0 { None } else { Some(inner) })
-        .flatten()
 }

src/utils.rs

@@ -1,10 +1,11 @@
 use poise::{
-    serenity::{
+    serenity_prelude as serenity,
+    serenity_prelude::{
         builder::CreateApplicationCommands,
         http::CacheHttp,
+        interaction::MessageFlags,
         model::id::{GuildId, UserId},
     },
-    serenity_prelude as serenity,
 };
 
 use crate::{
@@ -13,10 +14,10 @@ use crate::{
 };
 
 pub async fn register_application_commands(
-    ctx: &poise::serenity::client::Context,
+    ctx: &serenity::Context,
     framework: &poise::Framework<Data, Error>,
     guild_id: Option<GuildId>,
-) -> Result<(), poise::serenity::Error> {
+) -> Result<(), serenity::Error> {
     let mut commands_builder = CreateApplicationCommands::default();
     let commands = &framework.options().commands;
     for command in commands {
@@ -27,7 +28,7 @@ pub async fn register_application_commands(
             commands_builder.add_application_command(context_menu_command);
         }
     }
-    let commands_builder = poise::serenity::json::Value::Array(commands_builder.0);
+    let commands_builder = poise::serenity_prelude::json::Value::Array(commands_builder.0);
 
     if let Some(guild_id) = guild_id {
         ctx.http.create_guild_application_commands(guild_id.0, &commands_builder).await?;
@@ -102,6 +103,6 @@ pub fn send_as_initial_response(
         });
     }
     if ephemeral {
-        f.flags(serenity::InteractionApplicationCommandCallbackDataFlags::EPHEMERAL);
+        f.flags(MessageFlags::EPHEMERAL);
     }
 }

web/Cargo.toml

@@ -12,10 +12,10 @@ oauth2 = "4"
 log = "0.4"
 reqwest = "0.11"
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+sqlx = { version = "0.6", features = ["runtime-tokio-rustls", "macros", "mysql", "chrono", "json"] }
-sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "macros", "mysql", "chrono", "json"] }
 chrono = "0.4"
 chrono-tz = "0.5"
 lazy_static = "1.4.0"
 rand = "0.7"
 base64 = "0.13"
+csv = "1.1"

web/src/consts.rs

@@ -26,12 +26,8 @@ use serenity::model::prelude::AttachmentType;
 
 lazy_static! {
     pub static ref DEFAULT_AVATAR: AttachmentType<'static> = (
-        include_bytes!(concat!(
+        include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../assets/webhook.jpg")) as &[u8],
-            env!("CARGO_MANIFEST_DIR"),
+        "webhook.jpg",
-            "/../assets/",
-            env!("WEBHOOK_AVATAR", "WEBHOOK_AVATAR not provided for compilation")
-        )) as &[u8],
-        env!("WEBHOOK_AVATAR"),
     )
         .into();
     pub static ref SUBSCRIPTION_ROLES: HashSet<u64> = HashSet::from_iter(

web/src/lib.rs

@@ -126,6 +126,9 @@ pub async fn initialize(
                 routes::help_timers,
                 routes::help_todo_lists,
                 routes::help_macros,
+                routes::help_intervals,
+                routes::help_dashboard,
+                routes::help_iemanager,
             ],
         )
         .mount("/login", routes![routes::login::discord_login, routes::login::discord_callback])
@@ -143,10 +146,15 @@ pub async fn initialize(
                 routes::dashboard::guild::get_reminder_templates,
                 routes::dashboard::guild::create_reminder_template,
                 routes::dashboard::guild::delete_reminder_template,
-                routes::dashboard::guild::create_reminder,
+                routes::dashboard::guild::create_guild_reminder,
                 routes::dashboard::guild::get_reminders,
                 routes::dashboard::guild::edit_reminder,
                 routes::dashboard::guild::delete_reminder,
+                routes::dashboard::export::export_reminders,
+                routes::dashboard::export::export_reminder_templates,
+                routes::dashboard::export::export_todos,
+                routes::dashboard::export::import_reminders,
+                routes::dashboard::export::import_todos,
             ],
         )
         .launch()

web/src/macros.rs

@@ -1,7 +1,7 @@
 macro_rules! check_length {
     ($max:ident, $field:expr) => {
         if $field.len() > $max {
-            return json!({ "error": format!("{} exceeded", stringify!($max)) });
+            return Err(json!({ "error": format!("{} exceeded", stringify!($max)) }));
         }
     };
     ($max:ident, $field:expr, $($fields:expr),+) => {
@@ -25,7 +25,7 @@ macro_rules! check_length_opt {
 macro_rules! check_url {
     ($field:expr) => {
         if !($field.starts_with("http://") || $field.starts_with("https://")) {
-            return json!({ "error": "URL invalid" });
+            return Err(json!({ "error": "URL invalid" }));
         }
     };
     ($field:expr, $($fields:expr),+) => {
@@ -60,7 +60,7 @@ macro_rules! check_authorization {
 
                         match member {
                             Err(_) => {
-                                return json!({"error": "User not in guild"})
+                                return Err(json!({"error": "User not in guild"}));
                             }
 
                             Ok(_) => {}
@@ -68,13 +68,13 @@ macro_rules! check_authorization {
                     }
 
                     None => {
-                        return json!({"error": "Bot not in guild"})
+                        return Err(json!({"error": "Bot not in guild"}));
                     }
                 }
             }
 
             None => {
-                return json!({"error": "User not authorized"});
+                return Err(json!({"error": "User not authorized"}));
             }
         }
     }
@@ -117,3 +117,9 @@ macro_rules! update_field {
         update_field!($pool, $error, $reminder.[$($fields),+]);
     };
 }
+
+macro_rules! json_err {
+    ($message:expr) => {
+        Err(json!({ "error": $message }))
+    };
+}

web/src/routes/dashboard/export.rs

@@ -0,0 +1,430 @@
+use csv::{QuoteStyle, WriterBuilder};
+use rocket::{
+    http::CookieJar,
+    serde::json::{json, serde_json, Json},
+    State,
+};
+use serenity::{
+    client::Context,
+    model::id::{ChannelId, GuildId},
+};
+use sqlx::{MySql, Pool};
+
+use crate::routes::dashboard::{
+    create_reminder, generate_uid, ImportBody, JsonResult, Reminder, ReminderCsv,
+    ReminderTemplateCsv, TodoCsv,
+};
+
+#[get("/api/guild/<id>/export/reminders")]
+pub async fn export_reminders(
+    id: u64,
+    cookies: &CookieJar<'_>,
+    ctx: &State<Context>,
+    pool: &State<Pool<MySql>>,
+) -> JsonResult {
+    check_authorization!(cookies, ctx.inner(), id);
+
+    let mut csv_writer = WriterBuilder::new().quote_style(QuoteStyle::Always).from_writer(vec![]);
+
+    let channels_res = GuildId(id).channels(&ctx.inner()).await;
+
+    match channels_res {
+        Ok(channels) => {
+            let channels = channels
+                .keys()
+                .into_iter()
+                .map(|k| k.as_u64().to_string())
+                .collect::<Vec<String>>()
+                .join(",");
+
+            let result = sqlx::query_as_unchecked!(
+                ReminderCsv,
+                "SELECT
+                 reminders.attachment,
+                 reminders.attachment_name,
+                 reminders.avatar,
+                 CONCAT('#', channels.channel) AS 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.embed_fields,
+                 reminders.enabled,
+                 reminders.expires,
+                 reminders.interval_seconds,
+                 reminders.interval_months,
+                 reminders.name,
+                 reminders.restartable,
+                 reminders.tts,
+                 reminders.username,
+                 reminders.utc_time
+                FROM reminders
+                LEFT JOIN channels ON channels.id = reminders.channel_id
+                WHERE FIND_IN_SET(channels.channel, ?)",
+                channels
+            )
+            .fetch_all(pool.inner())
+            .await;
+
+            match result {
+                Ok(reminders) => {
+                    reminders.iter().for_each(|reminder| {
+                        csv_writer.serialize(reminder).unwrap();
+                    });
+
+                    match csv_writer.into_inner() {
+                        Ok(inner) => match String::from_utf8(inner) {
+                            Ok(encoded) => Ok(json!({ "body": encoded })),
+
+                            Err(e) => {
+                                warn!("Failed to write UTF-8: {:?}", e);
+
+                                Err(json!({"error": "Failed to write UTF-8"}))
+                            }
+                        },
+
+                        Err(e) => {
+                            warn!("Failed to extract CSV: {:?}", e);
+
+                            Err(json!({"error": "Failed to extract CSV"}))
+                        }
+                    }
+                }
+
+                Err(e) => {
+                    warn!("Failed to complete SQL query: {:?}", e);
+
+                    Err(json!({"error": "Failed to query reminders"}))
+                }
+            }
+        }
+
+        Err(e) => {
+            warn!("Could not fetch channels from {}: {:?}", id, e);
+
+            Err(json!({"error": "Failed to get guild channels"}))
+        }
+    }
+}
+
+#[put("/api/guild/<id>/export/reminders", data = "<body>")]
+pub async fn import_reminders(
+    id: u64,
+    cookies: &CookieJar<'_>,
+    body: Json<ImportBody>,
+    ctx: &State<Context>,
+    pool: &State<Pool<MySql>>,
+) -> JsonResult {
+    check_authorization!(cookies, ctx.inner(), id);
+
+    let user_id =
+        cookies.get_private("userid").map(|c| c.value().parse::<u64>().ok()).flatten().unwrap();
+
+    match base64::decode(&body.body) {
+        Ok(body) => {
+            let mut reader = csv::Reader::from_reader(body.as_slice());
+
+            for result in reader.deserialize::<ReminderCsv>() {
+                match result {
+                    Ok(record) => {
+                        let channel_id = record.channel.split_at(1).1;
+
+                        match channel_id.parse::<u64>() {
+                            Ok(channel_id) => {
+                                let reminder = Reminder {
+                                    attachment: record.attachment,
+                                    attachment_name: record.attachment_name,
+                                    avatar: record.avatar,
+                                    channel: channel_id,
+                                    content: record.content,
+                                    embed_author: record.embed_author,
+                                    embed_author_url: record.embed_author_url,
+                                    embed_color: record.embed_color,
+                                    embed_description: record.embed_description,
+                                    embed_footer: record.embed_footer,
+                                    embed_footer_url: record.embed_footer_url,
+                                    embed_image_url: record.embed_image_url,
+                                    embed_thumbnail_url: record.embed_thumbnail_url,
+                                    embed_title: record.embed_title,
+                                    embed_fields: record
+                                        .embed_fields
+                                        .map(|s| serde_json::from_str(&s).ok())
+                                        .flatten(),
+                                    enabled: record.enabled,
+                                    expires: record.expires,
+                                    interval_seconds: record.interval_seconds,
+                                    interval_months: record.interval_months,
+                                    name: record.name,
+                                    restartable: record.restartable,
+                                    tts: record.tts,
+                                    uid: generate_uid(),
+                                    username: record.username,
+                                    utc_time: record.utc_time,
+                                };
+
+                                create_reminder(
+                                    ctx.inner(),
+                                    pool.inner(),
+                                    GuildId(id),
+                                    UserId(user_id),
+                                    reminder,
+                                )
+                                .await?;
+                            }
+
+                            Err(_) => {
+                                return json_err!(format!(
+                                    "Failed to parse channel {}",
+                                    channel_id
+                                ));
+                            }
+                        }
+                    }
+
+                    Err(e) => {
+                        warn!("Couldn't deserialize CSV row: {:?}", e);
+
+                        return json_err!("Deserialize error. Aborted");
+                    }
+                }
+            }
+
+            Ok(json!({}))
+        }
+
+        Err(_) => {
+            json_err!("Malformed base64")
+        }
+    }
+}
+
+#[get("/api/guild/<id>/export/todos")]
+pub async fn export_todos(
+    id: u64,
+    cookies: &CookieJar<'_>,
+    ctx: &State<Context>,
+    pool: &State<Pool<MySql>>,
+) -> JsonResult {
+    check_authorization!(cookies, ctx.inner(), id);
+
+    let mut csv_writer = WriterBuilder::new().quote_style(QuoteStyle::Always).from_writer(vec![]);
+
+    match sqlx::query_as_unchecked!(
+        TodoCsv,
+        "SELECT value, CONCAT('#', channels.channel) AS channel_id FROM todos
+        LEFT JOIN channels ON todos.channel_id = channels.id
+        INNER JOIN guilds ON todos.guild_id = guilds.id
+        WHERE guilds.guild = ?",
+        id
+    )
+    .fetch_all(pool.inner())
+    .await
+    {
+        Ok(todos) => {
+            todos.iter().for_each(|todo| {
+                csv_writer.serialize(todo).unwrap();
+            });
+
+            match csv_writer.into_inner() {
+                Ok(inner) => match String::from_utf8(inner) {
+                    Ok(encoded) => Ok(json!({ "body": encoded })),
+
+                    Err(e) => {
+                        warn!("Failed to write UTF-8: {:?}", e);
+
+                        json_err!("Failed to write UTF-8")
+                    }
+                },
+
+                Err(e) => {
+                    warn!("Failed to extract CSV: {:?}", e);
+
+                    json_err!("Failed to extract CSV")
+                }
+            }
+        }
+
+        Err(e) => {
+            warn!("Could not fetch templates from {}: {:?}", id, e);
+
+            json_err!("Failed to query templates")
+        }
+    }
+}
+
+#[put("/api/guild/<id>/export/todos", data = "<body>")]
+pub async fn import_todos(
+    id: u64,
+    cookies: &CookieJar<'_>,
+    body: Json<ImportBody>,
+    ctx: &State<Context>,
+    pool: &State<Pool<MySql>>,
+) -> JsonResult {
+    check_authorization!(cookies, ctx.inner(), id);
+
+    let channels_res = GuildId(id).channels(&ctx.inner()).await;
+
+    match channels_res {
+        Ok(channels) => match base64::decode(&body.body) {
+            Ok(body) => {
+                let mut reader = csv::Reader::from_reader(body.as_slice());
+
+                let query_placeholder = "(?, (SELECT id FROM channels WHERE channel = ?), (SELECT id FROM guilds WHERE guild = ?))";
+                let mut query_params = vec![];
+
+                for result in reader.deserialize::<TodoCsv>() {
+                    match result {
+                        Ok(record) => match record.channel_id {
+                            Some(channel_id) => {
+                                let channel_id = channel_id.split_at(1).1;
+
+                                match channel_id.parse::<u64>() {
+                                    Ok(channel_id) => {
+                                        if channels.contains_key(&ChannelId(channel_id)) {
+                                            query_params.push((record.value, Some(channel_id), id));
+                                        } else {
+                                            return json_err!(format!(
+                                                "Invalid channel ID {}",
+                                                channel_id
+                                            ));
+                                        }
+                                    }
+
+                                    Err(_) => {
+                                        return json_err!(format!(
+                                            "Invalid channel ID {}",
+                                            channel_id
+                                        ));
+                                    }
+                                }
+                            }
+
+                            None => {
+                                query_params.push((record.value, None, id));
+                            }
+                        },
+
+                        Err(e) => {
+                            warn!("Couldn't deserialize CSV row: {:?}", e);
+
+                            return json_err!("Deserialize error. Aborted");
+                        }
+                    }
+                }
+
+                let _ = sqlx::query!(
+                    "DELETE FROM todos WHERE guild_id = (SELECT id FROM guilds WHERE guild = ?)",
+                    id
+                )
+                .execute(pool.inner())
+                .await;
+
+                let query_str = format!(
+                    "INSERT INTO todos (value, channel_id, guild_id) VALUES {}",
+                    vec![query_placeholder].repeat(query_params.len()).join(",")
+                );
+                let mut query = sqlx::query(&query_str);
+
+                for param in query_params {
+                    query = query.bind(param.0).bind(param.1).bind(param.2);
+                }
+
+                let res = query.execute(pool.inner()).await;
+
+                match res {
+                    Ok(_) => Ok(json!({})),
+
+                    Err(e) => {
+                        warn!("Couldn't execute todo query: {:?}", e);
+
+                        json_err!("An unexpected error occured.")
+                    }
+                }
+            }
+
+            Err(_) => {
+                json_err!("Malformed base64")
+            }
+        },
+
+        Err(e) => {
+            warn!("Couldn't fetch channels for guild {}: {:?}", id, e);
+
+            json_err!("Couldn't fetch channels.")
+        }
+    }
+}
+
+#[get("/api/guild/<id>/export/reminder_templates")]
+pub async fn export_reminder_templates(
+    id: u64,
+    cookies: &CookieJar<'_>,
+    ctx: &State<Context>,
+    pool: &State<Pool<MySql>>,
+) -> JsonResult {
+    check_authorization!(cookies, ctx.inner(), id);
+
+    let mut csv_writer = WriterBuilder::new().quote_style(QuoteStyle::Always).from_writer(vec![]);
+
+    match sqlx::query_as_unchecked!(
+        ReminderTemplateCsv,
+        "SELECT
+         name,
+         attachment,
+         attachment_name,
+         avatar,
+         content,
+         embed_author,
+         embed_author_url,
+         embed_color,
+         embed_description,
+         embed_footer,
+         embed_footer_url,
+         embed_image_url,
+         embed_thumbnail_url,
+         embed_title,
+         embed_fields,
+         tts,
+         username
+        FROM reminder_template WHERE guild_id = (SELECT id FROM guilds WHERE guild = ?)",
+        id
+    )
+    .fetch_all(pool.inner())
+    .await
+    {
+        Ok(templates) => {
+            templates.iter().for_each(|template| {
+                csv_writer.serialize(template).unwrap();
+            });
+
+            match csv_writer.into_inner() {
+                Ok(inner) => match String::from_utf8(inner) {
+                    Ok(encoded) => Ok(json!({ "body": encoded })),
+
+                    Err(e) => {
+                        warn!("Failed to write UTF-8: {:?}", e);
+
+                        json_err!("Failed to write UTF-8")
+                    }
+                },
+
+                Err(e) => {
+                    warn!("Failed to extract CSV: {:?}", e);
+
+                    json_err!("Failed to extract CSV")
+                }
+            }
+        }
+        Err(e) => {
+            warn!("Could not fetch templates from {}: {:?}", id, e);
+
+            json_err!("Failed to query templates")
+        }
+    }
+}

web/src/routes/dashboard/guild.rs

@@ -1,10 +1,8 @@
 use std::env;
 
-use base64;
-use chrono::Utc;
 use rocket::{
     http::CookieJar,
-    serde::json::{json, Json, Value as JsonValue},
+    serde::json::{json, Json},
     State,
 };
 use serde::Serialize;
@@ -18,16 +16,14 @@ use serenity::{
 use sqlx::{MySql, Pool};
 
 use crate::{
-    check_guild_subscription, check_subscription,
     consts::{
-        DAY, MAX_CONTENT_LENGTH, MAX_EMBED_AUTHOR_LENGTH, MAX_EMBED_DESCRIPTION_LENGTH,
+        MAX_CONTENT_LENGTH, MAX_EMBED_AUTHOR_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, template_name_default, DeleteReminder,
+        create_database_channel, create_reminder, template_name_default, DeleteReminder,
-        DeleteReminderTemplate, PatchReminder, Reminder, ReminderTemplate,
+        DeleteReminderTemplate, JsonResult, PatchReminder, Reminder, ReminderTemplate,
     },
 };
 
@@ -44,7 +40,7 @@ pub async fn get_guild_patreon(
     id: u64,
     cookies: &CookieJar<'_>,
     ctx: &State<Context>,
-) -> JsonValue {
+) -> JsonResult {
     check_authorization!(cookies, ctx.inner(), id);
 
     match GuildId(id).to_guild_cached(ctx.inner()) {
@@ -59,12 +55,10 @@ pub async fn get_guild_patreon(
                     .contains(&RoleId(env::var("PATREON_ROLE_ID").unwrap().parse().unwrap()))
             });
 
-            json!({ "patreon": patreon })
+            Ok(json!({ "patreon": patreon }))
         }
 
-        None => {
+        None => json_err!("Bot not in guild"),
-            json!({"error": "Bot not in guild"})
-        }
     }
 }
 
@@ -73,7 +67,7 @@ pub async fn get_guild_channels(
     id: u64,
     cookies: &CookieJar<'_>,
     ctx: &State<Context>,
-) -> JsonValue {
+) -> JsonResult {
     check_authorization!(cookies, ctx.inner(), id);
 
     match GuildId(id).to_guild_cached(ctx.inner()) {
@@ -97,12 +91,10 @@ pub async fn get_guild_channels(
                 })
                 .collect::<Vec<ChannelInfo>>();
 
-            json!(channel_info)
+            Ok(json!(channel_info))
         }
 
-        None => {
+        None => json_err!("Bot not in guild"),
-            json!({"error": "Bot not in guild"})
-        }
     }
 }
 
@@ -113,7 +105,7 @@ struct RoleInfo {
 }
 
 #[get("/api/guild/<id>/roles")]
-pub async fn get_guild_roles(id: u64, cookies: &CookieJar<'_>, ctx: &State<Context>) -> JsonValue {
+pub async fn get_guild_roles(id: u64, cookies: &CookieJar<'_>, ctx: &State<Context>) -> JsonResult {
     check_authorization!(cookies, ctx.inner(), id);
 
     let roles_res = ctx.cache.guild_roles(id);
@@ -125,12 +117,12 @@ pub async fn get_guild_roles(id: u64, cookies: &CookieJar<'_>, ctx: &State<Conte
                 .map(|(_, r)| RoleInfo { id: r.id.to_string(), name: r.name.to_string() })
                 .collect::<Vec<RoleInfo>>();
 
-            json!(roles)
+            Ok(json!(roles))
         }
         None => {
             warn!("Could not fetch roles from {}", id);
 
-            json!({"error": "Could not get roles"})
+            json_err!("Could not get roles")
         }
     }
 }
@@ -141,7 +133,7 @@ pub async fn get_reminder_templates(
     cookies: &CookieJar<'_>,
     ctx: &State<Context>,
     pool: &State<Pool<MySql>>,
-) -> JsonValue {
+) -> JsonResult {
     check_authorization!(cookies, ctx.inner(), id);
 
     match sqlx::query_as_unchecked!(
@@ -152,13 +144,11 @@ pub async fn get_reminder_templates(
     .fetch_all(pool.inner())
     .await
     {
-        Ok(templates) => {
+        Ok(templates) => Ok(json!(templates)),
-            json!(templates)
-        }
         Err(e) => {
             warn!("Could not fetch templates from {}: {:?}", id, e);
 
-            json!({"error": "Could not get templates"})
+            json_err!("Could not get templates")
         }
     }
 }
@@ -170,7 +160,7 @@ pub async fn create_reminder_template(
     cookies: &CookieJar<'_>,
     ctx: &State<Context>,
     pool: &State<Pool<MySql>>,
-) -> JsonValue {
+) -> JsonResult {
     check_authorization!(cookies, ctx.inner(), id);
 
     // validate lengths
@@ -254,12 +244,12 @@ pub async fn create_reminder_template(
     .await
     {
         Ok(_) => {
-            json!({})
+            Ok(json!({}))
         }
         Err(e) => {
             warn!("Could not fetch templates from {}: {:?}", id, e);
 
-            json!({"error": "Could not get templates"})
+            json_err!("Could not get templates")
         }
     }
 }
@@ -271,7 +261,7 @@ pub async fn delete_reminder_template(
     cookies: &CookieJar<'_>,
     ctx: &State<Context>,
     pool: &State<Pool<MySql>>,
-) -> JsonValue {
+) -> JsonResult {
     check_authorization!(cookies, ctx.inner(), id);
 
     match sqlx::query!(
@@ -282,233 +272,41 @@ pub async fn delete_reminder_template(
     .await
     {
         Ok(_) => {
-            json!({})
+            Ok(json!({}))
         }
         Err(e) => {
             warn!("Could not delete template from {}: {:?}", id, e);
 
-            json!({"error": "Could not delete template"})
+            json_err!("Could not delete template")
         }
     }
 }
 
 #[post("/api/guild/<id>/reminders", data = "<reminder>")]
-pub async fn create_reminder(
+pub async fn create_guild_reminder(
     id: u64,
     reminder: Json<Reminder>,
     cookies: &CookieJar<'_>,
     serenity_context: &State<Context>,
     pool: &State<Pool<MySql>>,
-) -> JsonValue {
+) -> JsonResult {
     check_authorization!(cookies, serenity_context.inner(), id);
 
     let user_id =
         cookies.get_private("userid").map(|c| c.value().parse::<u64>().ok()).flatten().unwrap();
 
-    // validate channel
+    create_reminder(
-    let channel = ChannelId(reminder.channel).to_channel_cached(&serenity_context.inner());
-    let channel_exists = channel.is_some();
-
-    let channel_matches_guild =
-        channel.map_or(false, |c| c.guild().map_or(false, |c| c.guild_id.0 == id));
-
-    if !channel_matches_guild || !channel_exists {
-        warn!(
-            "Error in `create_reminder`: channel {} not found for guild {} (channel exists: {})",
-            reminder.channel, id, channel_exists
-        );
-
-        return json!({"error": "Channel not found"});
-    }
-
-    let channel = create_database_channel(
         serenity_context.inner(),
-        ChannelId(reminder.channel),
         pool.inner(),
+        GuildId(id),
+        UserId(user_id),
+        reminder.into_inner(),
     )
-    .await;
-
-    if let Err(e) = channel {
-        warn!("`create_database_channel` returned an error code: {:?}", e);
-
-        return json!({"error": "Failed to configure channel for reminders. Please check the bot permissions"});
-    }
-
-    let channel = channel.unwrap();
-
-    // validate lengths
-    check_length!(MAX_CONTENT_LENGTH, reminder.content);
-    check_length!(MAX_EMBED_DESCRIPTION_LENGTH, reminder.embed_description);
-    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,
-        reminder.embed_footer_url,
-        reminder.embed_thumbnail_url,
-        reminder.embed_author_url,
-        reminder.embed_image_url,
-        reminder.avatar
-    );
-
-    // validate urls
-    check_url_opt!(
-        reminder.embed_footer_url,
-        reminder.embed_thumbnail_url,
-        reminder.embed_author_url,
-        reminder.embed_image_url,
-        reminder.avatar
-    );
-
-    // validate time and interval
-    if reminder.utc_time < Utc::now().naive_utc() {
-        return json!({"error": "Time must be in the future"});
-    }
-    if reminder.interval_seconds.is_some() || reminder.interval_months.is_some() {
-        if reminder.interval_months.unwrap_or(0) * 30 * DAY as u32
-            + reminder.interval_seconds.unwrap_or(0)
-            < *MIN_INTERVAL
-        {
-            return json!({"error": "Interval too short"});
-        }
-    }
-
-    // check patreon if necessary
-    if reminder.interval_seconds.is_some() || reminder.interval_months.is_some() {
-        if !check_guild_subscription(serenity_context.inner(), GuildId(id)).await
-            && !check_subscription(serenity_context.inner(), user_id).await
-        {
-            return json!({"error": "Patreon is required to set intervals"});
-        }
-    }
-
-    // base64 decode error dropped here
-    let attachment_data = reminder.attachment.as_ref().map(|s| base64::decode(s).ok()).flatten();
-    let name = if reminder.name.is_empty() { name_default() } else { reminder.name.clone() };
-
-    let new_uid = generate_uid();
-
-    // write to db
-    match sqlx::query!(
-        "INSERT INTO reminders (
-         uid,
-         attachment,
-         attachment_name,
-         channel_id,
-         avatar,
-         content,
-         embed_author,
-         embed_author_url,
-         embed_color,
-         embed_description,
-         embed_footer,
-         embed_footer_url,
-         embed_image_url,
-         embed_thumbnail_url,
-         embed_title,
-         embed_fields,
-         enabled,
-         expires,
-         interval_seconds,
-         interval_months,
-         name,
-         pin,
-         restartable,
-         tts,
-         username,
-         `utc_time`
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
-        new_uid,
-        attachment_data,
-        reminder.attachment_name,
-        channel,
-        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.embed_fields,
-        reminder.enabled,
-        reminder.expires,
-        reminder.interval_seconds,
-        reminder.interval_months,
-        name,
-        reminder.pin,
-        reminder.restartable,
-        reminder.tts,
-        reminder.username,
-        reminder.utc_time,
-    )
-    .execute(pool.inner())
     .await
-    {
-        Ok(_) => 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,
-             reminders.embed_fields,
-             reminders.enabled,
-             reminders.expires,
-             reminders.interval_seconds,
-             reminders.interval_months,
-             reminders.name,
-             reminders.pin,
-             reminders.restartable,
-             reminders.tts,
-             reminders.uid,
-             reminders.username,
-             reminders.utc_time
-            FROM reminders
-            LEFT JOIN channels ON channels.id = reminders.channel_id
-            WHERE uid = ?",
-            new_uid
-        )
-        .fetch_one(pool.inner())
-        .await
-        .map(|r| json!(r))
-        .unwrap_or_else(|e| {
-            warn!("Failed to complete SQL query: {:?}", e);
-
-            json!({"error": "Could not load reminder"})
-        }),
-
-        Err(e) => {
-            warn!("Error in `create_reminder`: Could not execute query: {:?}", e);
-
-            json!({"error": "Unknown error"})
-        }
-    }
 }
 
 #[get("/api/guild/<id>/reminders")]
-pub async fn get_reminders(id: u64, ctx: &State<Context>, pool: &State<Pool<MySql>>) -> JsonValue {
+pub async fn get_reminders(id: u64, ctx: &State<Context>, pool: &State<Pool<MySql>>) -> JsonResult {
     let channels_res = GuildId(id).channels(&ctx.inner()).await;
 
     match channels_res {
@@ -543,7 +341,6 @@ pub async fn get_reminders(id: u64, ctx: &State<Context>, pool: &State<Pool<MySq
                  reminders.interval_seconds,
                  reminders.interval_months,
                  reminders.name,
-                 reminders.pin,
                  reminders.restartable,
                  reminders.tts,
                  reminders.uid,
@@ -556,17 +353,17 @@ pub async fn get_reminders(id: u64, ctx: &State<Context>, pool: &State<Pool<MySq
             )
             .fetch_all(pool.inner())
             .await
-            .map(|r| json!(r))
+            .map(|r| Ok(json!(r)))
             .unwrap_or_else(|e| {
                 warn!("Failed to complete SQL query: {:?}", e);
 
-                json!({"error": "Could not load reminders"})
+                json_err!("Could not load reminders")
             })
         }
         Err(e) => {
             warn!("Could not fetch channels from {}: {:?}", id, e);
 
-            json!([])
+            Ok(json!([]))
         }
     }
 }
@@ -577,7 +374,7 @@ pub async fn edit_reminder(
     reminder: Json<PatchReminder>,
     serenity_context: &State<Context>,
     pool: &State<Pool<MySql>>,
-) -> JsonValue {
+) -> JsonResult {
     let mut error = vec![];
 
     update_field!(pool.inner(), error, reminder.[
@@ -600,7 +397,6 @@ pub async fn edit_reminder(
         interval_seconds,
         interval_months,
         name,
-        pin,
         restartable,
         tts,
         username,
@@ -619,7 +415,7 @@ pub async fn edit_reminder(
                         reminder.channel, id
                     );
 
-                    return json!({"error": "Channel not found"});
+                    return Err(json!({"error": "Channel not found"}));
                 }
 
                 let channel = create_database_channel(
@@ -632,7 +428,9 @@ pub async fn edit_reminder(
                 if let Err(e) = channel {
                     warn!("`create_database_channel` returned an error code: {:?}", e);
 
-                    return json!({"error": "Failed to configure channel for reminders. Please check the bot permissions"});
+                    return Err(
+                        json!({"error": "Failed to configure channel for reminders. Please check the bot permissions"}),
+                    );
                 }
 
                 let channel = channel.unwrap();
@@ -660,7 +458,7 @@ pub async fn edit_reminder(
                     reminder.channel, id
                 );
 
-                return json!({"error": "Channel not found"});
+                return Err(json!({"error": "Channel not found"}));
             }
         }
     }
@@ -687,7 +485,6 @@ pub async fn edit_reminder(
          reminders.interval_seconds,
          reminders.interval_months,
          reminders.name,
-         reminders.pin,
          reminders.restartable,
          reminders.tts,
          reminders.uid,
@@ -701,12 +498,12 @@ pub async fn edit_reminder(
     .fetch_one(pool.inner())
     .await
     {
-        Ok(reminder) => json!({"reminder": reminder, "errors": error}),
+        Ok(reminder) => Ok(json!({"reminder": reminder, "errors": error})),
 
         Err(e) => {
             warn!("Error exiting `edit_reminder': {:?}", e);
 
-            json!({"reminder": Option::<Reminder>::None, "errors": vec!["Unknown error"]})
+            Err(json!({"reminder": Option::<Reminder>::None, "errors": vec!["Unknown error"]}))
         }
     }
 }
@@ -715,19 +512,17 @@ pub async fn edit_reminder(
 pub async fn delete_reminder(
     reminder: Json<DeleteReminder>,
     pool: &State<Pool<MySql>>,
-) -> JsonValue {
+) -> JsonResult {
     match sqlx::query!("DELETE FROM reminders WHERE uid = ?", reminder.uid)
         .execute(pool.inner())
         .await
     {
-        Ok(_) => {
+        Ok(_) => Ok(json!({})),
-            json!({})
-        }
 
         Err(e) => {
             warn!("Error in `delete_reminder`: {:?}", e);
 
-            json!({"error": "Could not delete reminder"})
+            Err(json!({"error": "Could not delete reminder"}))
         }
     }
 }

web/src/routes/dashboard/mod.rs

@@ -1,21 +1,37 @@
 use std::collections::HashMap;
 
-use chrono::naive::NaiveDateTime;
+use chrono::{naive::NaiveDateTime, Utc};
 use rand::{rngs::OsRng, seq::IteratorRandom};
-use rocket::{http::CookieJar, response::Redirect};
+use rocket::{
+    http::CookieJar,
+    response::Redirect,
+    serde::json::{json, Value as JsonValue},
+};
 use rocket_dyn_templates::Template;
 use serde::{Deserialize, Serialize};
-use serenity::{http::Http, model::id::ChannelId};
+use serenity::{
-use sqlx::{types::Json, Executor};
+    client::Context,
+    http::Http,
+    model::id::{ChannelId, GuildId, UserId},
+};
+use sqlx::{types::Json, Executor, MySql, Pool};
 
 use crate::{
-    consts::{CHARACTERS, DEFAULT_AVATAR},
+    check_guild_subscription, check_subscription,
+    consts::{
+        CHARACTERS, DAY, DEFAULT_AVATAR, MAX_CONTENT_LENGTH, MAX_EMBED_AUTHOR_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,
+    },
     Database, Error,
 };
 
+pub mod export;
 pub mod guild;
 pub mod user;
 
+pub type JsonResult = Result<JsonValue, JsonValue>;
 type Unset<T> = Option<T>;
 
 fn name_default() -> String {
@@ -60,6 +76,28 @@ pub struct ReminderTemplate {
     username: Option<String>,
 }
 
+#[derive(Serialize, Deserialize)]
+pub struct ReminderTemplateCsv {
+    #[serde(default = "template_name_default")]
+    name: String,
+    attachment: Option<Vec<u8>>,
+    attachment_name: Option<String>,
+    avatar: Option<String>,
+    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<String>,
+    tts: bool,
+    username: Option<String>,
+}
+
 #[derive(Deserialize)]
 pub struct DeleteReminderTemplate {
     id: u32,
@@ -97,7 +135,6 @@ pub struct Reminder {
     interval_months: Option<u32>,
     #[serde(default = "name_default")]
     name: String,
-    pin: bool,
     restartable: bool,
     tts: bool,
     #[serde(default)]
@@ -106,6 +143,36 @@ pub struct Reminder {
     utc_time: NaiveDateTime,
 }
 
+#[derive(Serialize, Deserialize)]
+pub struct ReminderCsv {
+    #[serde(with = "base64s")]
+    attachment: Option<Vec<u8>>,
+    attachment_name: Option<String>,
+    avatar: Option<String>,
+    channel: String,
+    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<String>,
+    enabled: bool,
+    expires: Option<NaiveDateTime>,
+    interval_seconds: Option<u32>,
+    interval_months: Option<u32>,
+    #[serde(default = "name_default")]
+    name: String,
+    restartable: bool,
+    tts: bool,
+    username: Option<String>,
+    utc_time: NaiveDateTime,
+}
+
 #[derive(Deserialize)]
 pub struct PatchReminder {
     uid: String,
@@ -151,8 +218,6 @@ pub struct PatchReminder {
     #[serde(default)]
     name: Unset<String>,
     #[serde(default)]
-    pin: Unset<bool>,
-    #[serde(default)]
     restartable: Unset<bool>,
     #[serde(default)]
     tts: Unset<bool>,
@@ -213,8 +278,8 @@ mod base64s {
     where
         D: Deserializer<'de>,
     {
-        let string = String::deserialize(deserializer)?;
+        let string = Option::<String>::deserialize(deserializer)?;
-        Some(base64::decode(string).map_err(de::Error::custom)).transpose()
+        Some(string.map(|b| base64::decode(b).map_err(de::Error::custom))).flatten().transpose()
     }
 }
 
@@ -223,13 +288,225 @@ pub struct DeleteReminder {
     uid: String,
 }
 
+#[derive(Deserialize)]
+pub struct ImportBody {
+    body: String,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct TodoCsv {
+    value: String,
+    channel_id: Option<String>,
+}
+
+pub async fn create_reminder(
+    ctx: &Context,
+    pool: &Pool<MySql>,
+    guild_id: GuildId,
+    user_id: UserId,
+    reminder: Reminder,
+) -> JsonResult {
+    // validate channel
+    let channel = ChannelId(reminder.channel).to_channel_cached(&ctx);
+    let channel_exists = channel.is_some();
+
+    let channel_matches_guild =
+        channel.map_or(false, |c| c.guild().map_or(false, |c| c.guild_id == guild_id));
+
+    if !channel_matches_guild || !channel_exists {
+        warn!(
+            "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;
+
+    if let Err(e) = channel {
+        warn!("`create_database_channel` returned an error code: {:?}", e);
+
+        return Err(
+            json!({"error": "Failed to configure channel for reminders. Please check the bot permissions"}),
+        );
+    }
+
+    let channel = channel.unwrap();
+
+    // validate lengths
+    check_length!(MAX_CONTENT_LENGTH, reminder.content);
+    check_length!(MAX_EMBED_DESCRIPTION_LENGTH, reminder.embed_description);
+    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,
+        reminder.embed_footer_url,
+        reminder.embed_thumbnail_url,
+        reminder.embed_author_url,
+        reminder.embed_image_url,
+        reminder.avatar
+    );
+
+    // validate urls
+    check_url_opt!(
+        reminder.embed_footer_url,
+        reminder.embed_thumbnail_url,
+        reminder.embed_author_url,
+        reminder.embed_image_url,
+        reminder.avatar
+    );
+
+    // validate time and interval
+    if reminder.utc_time < Utc::now().naive_utc() {
+        return Err(json!({"error": "Time must be in the future"}));
+    }
+    if reminder.interval_seconds.is_some() || reminder.interval_months.is_some() {
+        if reminder.interval_months.unwrap_or(0) * 30 * DAY as u32
+            + reminder.interval_seconds.unwrap_or(0)
+            < *MIN_INTERVAL
+        {
+            return Err(json!({"error": "Interval too short"}));
+        }
+    }
+
+    // check patreon if necessary
+    if reminder.interval_seconds.is_some() || reminder.interval_months.is_some() {
+        if !check_guild_subscription(&ctx, guild_id).await
+            && !check_subscription(&ctx, user_id).await
+        {
+            return Err(json!({"error": "Patreon is required to set intervals"}));
+        }
+    }
+
+    // base64 decode error dropped here
+    let attachment_data = reminder.attachment.as_ref().map(|s| base64::decode(s).ok()).flatten();
+    let name = if reminder.name.is_empty() { name_default() } else { reminder.name.clone() };
+
+    let new_uid = generate_uid();
+
+    // write to db
+    match sqlx::query!(
+        "INSERT INTO reminders (
+         uid,
+         attachment,
+         attachment_name,
+         channel_id,
+         avatar,
+         content,
+         embed_author,
+         embed_author_url,
+         embed_color,
+         embed_description,
+         embed_footer,
+         embed_footer_url,
+         embed_image_url,
+         embed_thumbnail_url,
+         embed_title,
+         embed_fields,
+         enabled,
+         expires,
+         interval_seconds,
+         interval_months,
+         name,
+         restartable,
+         tts,
+         username,
+         `utc_time`
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+        new_uid,
+        attachment_data,
+        reminder.attachment_name,
+        channel,
+        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.embed_fields,
+        reminder.enabled,
+        reminder.expires,
+        reminder.interval_seconds,
+        reminder.interval_months,
+        name,
+        reminder.restartable,
+        reminder.tts,
+        reminder.username,
+        reminder.utc_time,
+    )
+    .execute(pool)
+    .await
+    {
+        Ok(_) => 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,
+             reminders.embed_fields,
+             reminders.enabled,
+             reminders.expires,
+             reminders.interval_seconds,
+             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 uid = ?",
+            new_uid
+        )
+        .fetch_one(pool)
+        .await
+        .map(|r| Ok(json!(r)))
+        .unwrap_or_else(|e| {
+            warn!("Failed to complete SQL query: {:?}", e);
+
+            Err(json!({"error": "Could not load reminder"}))
+        }),
+
+        Err(e) => {
+            warn!("Error in `create_reminder`: Could not execute query: {:?}", e);
+
+            Err(json!({"error": "Unknown error"}))
+        }
+    }
+}
+
 async fn create_database_channel(
     ctx: impl AsRef<Http>,
     channel: ChannelId,
     pool: impl Executor<'_, Database = Database> + Copy,
 ) -> Result<u32, crate::Error> {
-    println!("{:?}", channel);
-
     let row =
         sqlx::query!("SELECT webhook_token, webhook_id FROM channels WHERE channel = ?", channel.0)
             .fetch_one(pool)

web/src/routes/dashboard/user.rs

@@ -61,10 +61,13 @@ pub async fn get_user_info(
             .member(&ctx.inner(), user_id)
             .await;
 
-        let timezone = sqlx::query!("SELECT timezone FROM users WHERE user = ?", user_id)
+        let timezone = sqlx::query!(
-            .fetch_one(pool.inner())
+            "SELECT IFNULL(timezone, 'UTC') AS timezone FROM users WHERE user = ?",
-            .await
+            user_id
-            .map_or(None, |q| Some(q.timezone));
+        )
+        .fetch_one(pool.inner())
+        .await
+        .map_or(None, |q| Some(q.timezone));
 
         let user_info = UserInfo {
             name: cookies

web/src/routes/login.rs

@@ -25,7 +25,6 @@ pub async fn discord_login(
         // Set the desired scopes.
         .add_scope(Scope::new("identify".to_string()))
         .add_scope(Scope::new("guilds".to_string()))
-        .add_scope(Scope::new("email".to_string()))
         // Set the PKCE code challenge.
         .set_pkce_challenge(pkce_challenge)
         .url();

web/src/routes/mod.rs

@@ -86,3 +86,21 @@ pub async fn help_macros() -> Template {
     let map: HashMap<&str, String> = HashMap::new();
     Template::render("support/macros", &map)
 }
+
+#[get("/intervals")]
+pub async fn help_intervals() -> Template {
+    let map: HashMap<&str, String> = HashMap::new();
+    Template::render("support/intervals", &map)
+}
+
+#[get("/dashboard")]
+pub async fn help_dashboard() -> Template {
+    let map: HashMap<&str, String> = HashMap::new();
+    Template::render("support/dashboard", &map)
+}
+
+#[get("/iemanager")]
+pub async fn help_iemanager() -> Template {
+    let map: HashMap<&str, String> = HashMap::new();
+    Template::render("support/iemanager", &map)
+}

web/static/css/style.css

@@ -288,6 +288,10 @@ textarea, input {
     width: 100%;
 }
 
+input.default-width {
+    width: initial;
+}
+
 .message-input:placeholder-shown {
     border-top: none;
     border-left: none;

web/static/js/main.js

@@ -12,12 +12,25 @@ const $createTemplateBtn = $createReminder.querySelector("button#createTemplate"
 const $loadTemplateBtn = document.querySelector("button#load-template");
 const $deleteTemplateBtn = document.querySelector("button#delete-template");
 const $templateSelect = document.querySelector("select#templateSelect");
+const $exportBtn = document.querySelector("button#export-data");
+const $importBtn = document.querySelector("button#import-data");
+const $downloader = document.querySelector("a#downloader");
+const $uploader = document.querySelector("input#uploader");
 
 let channels = [];
+let guildNames = {};
 let roles = [];
 let templates = {};
+let mentions = new Tribute({
+    values: [],
+    allowSpaces: true,
+    selectTemplate: (item) => {
+        return `<@&${item.original.value}>`;
+    },
+});
 
 let globalPatreon = false;
+let guildPatreon = false;
 
 function guildId() {
     return document.querySelector(".guildList a.is-active").dataset["guild"];
@@ -31,18 +44,6 @@ function intToColor(i) {
     return `#${i.toString(16).padStart(6, "0")}`;
 }
 
-function resize_textareas() {
-    document.querySelectorAll("textarea.autoresize").forEach((element) => {
-        element.style.height = "";
-        element.style.height = element.scrollHeight + 3 + "px";
-
-        element.addEventListener("input", () => {
-            element.style.height = "";
-            element.style.height = element.scrollHeight + 3 + "px";
-        });
-    });
-}
-
 function switch_pane(selector) {
     document.querySelectorAll("aside a").forEach((el) => {
         el.classList.remove("is-active");
@@ -52,8 +53,6 @@ function switch_pane(selector) {
     });
 
     document.getElementById(selector).classList.remove("is-hidden");
-
-    resize_textareas();
 }
 
 function update_select(sel) {
@@ -78,6 +77,18 @@ function reset_guild_pane() {
         .forEach((opt) => opt.remove());
 }
 
+async function fetch_patreon(guild_id) {
+    fetch(`/dashboard/api/guild/${guild_id}/patreon`)
+        .then((response) => response.json())
+        .then((data) => {
+            if (data.error) {
+                show_error(data.error);
+            } else {
+                return data.patreon;
+            }
+        });
+}
+
 function fetch_roles(guild_id) {
     fetch(`/dashboard/api/guild/${guild_id}/roles`)
         .then((response) => response.json())
@@ -85,7 +96,16 @@ function fetch_roles(guild_id) {
             if (data.error) {
                 show_error(data.error);
             } else {
-                roles = data;
+                let values = Array.from(
+                    data.map((role) => {
+                        return {
+                            key: role.name,
+                            value: role.id,
+                        };
+                    })
+                );
+
+                mentions.collection[0].values = values;
             }
         });
 }
@@ -158,6 +178,8 @@ async function fetch_reminders(guild_id) {
                     newFrame.querySelector(".reminderContent").dataset["uid"] =
                         reminder["uid"];
 
+                    mentions.attach(newFrame.querySelector("textarea"));
+
                     deserialize_reminder(reminder, newFrame, "load");
 
                     $reminderBox.appendChild(newFrame);
@@ -299,7 +321,6 @@ async function serialize_reminder(node, mode) {
         interval_seconds: mode !== "template" ? interval.seconds : null,
         interval_months: mode !== "template" ? interval.months : null,
         name: node.querySelector('input[name="name"]').value,
-        pin: node.querySelector('input[name="pin"]').checked,
         tts: node.querySelector('input[name="tts"]').checked,
         username: node.querySelector('input[name="username"]').value,
         utc_time: utc_time,
@@ -370,6 +391,10 @@ function deserialize_reminder(reminder, frame, mode) {
 document.addEventListener("guildSwitched", async (e) => {
     $loader.classList.remove("is-hidden");
 
+    document
+        .querySelectorAll(".patreon-only")
+        .forEach((el) => el.classList.add("is-locked"));
+
     let $anchor = document.querySelector(
         `.switch-pane[data-guild="${e.detail.guild_id}"]`
     );
@@ -378,6 +403,12 @@ document.addEventListener("guildSwitched", async (e) => {
     reset_guild_pane();
     $anchor.classList.add("is-active");
 
+    if (globalPatreon || (await fetch_patreon(e.detail.guild_id))) {
+        document
+            .querySelectorAll(".patreon-only")
+            .forEach((el) => el.classList.remove("is-locked"));
+    }
+
     fetch_roles(e.detail.guild_id);
     fetch_templates(e.detail.guild_id);
     await fetch_channels(e.detail.guild_id);
@@ -392,8 +423,6 @@ document.addEventListener("guildSwitched", async (e) => {
         });
     });
 
-    resize_textareas();
-
     $loader.classList.add("is-hidden");
 });
 
@@ -531,6 +560,8 @@ document.querySelectorAll(".show-modal").forEach((element) => {
 document.addEventListener("DOMContentLoaded", () => {
     $loader.classList.remove("is-hidden");
 
+    mentions.attach(document.querySelectorAll("textarea"));
+
     document.querySelectorAll(".navbar-burger").forEach((el) => {
         el.addEventListener("click", () => {
             const target = el.dataset["target"];
@@ -569,6 +600,8 @@ document.addEventListener("DOMContentLoaded", () => {
                 const $template = document.getElementById("guildListEntry");
 
                 for (let guild of data) {
+                    guildNames[guild.id] = guild.name;
+
                     document.querySelectorAll(".guildList").forEach((element) => {
                         const $clone = $template.content.cloneNode(true);
                         const $anchor = $clone.querySelector("a");
@@ -585,11 +618,7 @@ document.addEventListener("DOMContentLoaded", () => {
 
                         $anchor.addEventListener("click", async (e) => {
                             e.preventDefault();
-                            window.history.pushState(
+                            window.history.pushState({}, "", `/dashboard/${guild.id}`);
-                                {},
-                                "",
-                                `/dashboard/${guild.id}?name=${guild.name}`
-                            );
                             const event = new CustomEvent("guildSwitched", {
                                 detail: {
                                     guild_name: guild.name,
@@ -607,8 +636,8 @@ document.addEventListener("DOMContentLoaded", () => {
                 const matches = window.location.href.match(/dashboard\/(\d+)/);
                 if (matches) {
                     let id = matches[1];
-                    let name =
+                    let name = guildNames[id];
-                        new URLSearchParams(window.location.search).get("name") || id;
+
                     const event = new CustomEvent("guildSwitched", {
                         detail: {
                             guild_name: name,
@@ -645,6 +674,39 @@ function has_source(string) {
     }
 }
 
+$uploader.addEventListener("change", (ev) => {
+    const urlTail = document.querySelector('input[name="exportSelect"]:checked').value;
+
+    new Promise((resolve) => {
+        let fileReader = new FileReader();
+        fileReader.onload = (e) => resolve(fileReader.result);
+        fileReader.readAsDataURL($uploader.files[0]);
+    }).then((dataUrl) => {
+        fetch(`/dashboard/api/guild/${guildId()}/export/${urlTail}`, {
+            method: "PUT",
+            body: JSON.stringify({ body: dataUrl.split(",")[1] }),
+        }).then(() => {
+            delete $uploader.files[0];
+        });
+    });
+});
+
+$importBtn.addEventListener("click", () => {
+    $uploader.click();
+});
+
+$exportBtn.addEventListener("click", () => {
+    const urlTail = document.querySelector('input[name="exportSelect"]:checked').value;
+
+    fetch(`/dashboard/api/guild/${guildId()}/export/${urlTail}`)
+        .then((response) => response.json())
+        .then((data) => {
+            $downloader.href =
+                "data:text/plain;charset=utf-8," + encodeURIComponent(data.body);
+            $downloader.click();
+        });
+});
+
 $createReminderBtn.addEventListener("click", async () => {
     $createReminderBtn.querySelector("span.icon > i").classList = [
         "fas fa-spinner fa-spin",
@@ -809,7 +871,7 @@ document.addEventListener("remindersLoaded", () => {
         });
     });
 
-    const fileInput = document.querySelectorAll("input[type=file]");
+    const fileInput = document.querySelectorAll("input.file-input[type=file]");
 
     fileInput.forEach((element) => {
         element.addEventListener("change", () => {
@@ -901,7 +963,6 @@ document.addEventListener("DOMNodeInserted", () => {
     });
 
     check_embed_fields();
-    resize_textareas();
 });
 
 document.addEventListener("click", (ev) => {

web/templates/dashboard.html.tera

@@ -27,8 +27,10 @@
     <link rel="stylesheet" href="/static/css/font.css">
     <link rel="stylesheet" href="/static/css/style.css">
     <link rel="stylesheet" href="/static/css/dtsel.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tributejs/5.1.3/tribute.css" integrity="sha512-GnwBnXd+ZGO9CdP343MUr0jCcJXCr++JVtQRnllexRW2IDq4Zvrh/McTQjooAKnSUbXZ7wamp7AQSweTnfMVoA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 
     <script src="/static/js/luxon.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/tributejs/5.1.3/tribute.min.js" integrity="sha512-KJYWC7RKz/Abtsu1QXd7VJ1IJua7P7GTpl3IKUqfa21Otg2opvRYmkui/CXBC6qeDYCNlQZ7c+7JfDXnKdILUA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 </head>
 <body>
 <nav class="navbar is-spaced is-size-4 is-hidden-desktop dashboard-navbar" role="navigation"
@@ -173,10 +175,43 @@
             <button class="delete close-modal" aria-label="close"></button>
         </header>
         <section class="modal-card-body">
+            <div class="control">
+                <div class="field">
+                    <label>
+                        <input type="radio" class="default-width" name="exportSelect" value="reminders" checked>
+                        Reminders
+                    </label>
+                </div>
+            </div>
+            <div class="control">
+                <div class="field">
+                    <label>
+                        <input type="radio" class="default-width" name="exportSelect" value="todos">
+                        Todo Lists
+                    </label>
+                </div>
+            </div>
+            <div class="control">
+                <div class="field">
+                    <label>
+                        <input type="radio" class="default-width" name="exportSelect" value="reminder_templates">
+                        Reminder templates
+                    </label>
+                </div>
+            </div>
+            <br>
             <div class="has-text-centered">
+                <div style="color: red; font-weight: bold;">
+                    By selecting "Import", you understand that this will overwrite existing data.
+                </div>
+                <div style="color: red">
+                    Please first read the <a href="/help/iemanager">support page</a>
+                </div>
                 <button class="button is-success is-outlined" id="import-data">Import Data</button>
                 <button class="button is-success" id="export-data">Export Data</button>
             </div>
+            <a id="downloader" download="export.csv" class="is-hidden"></a>
+            <input id="uploader" type="file" hidden></input>
         </section>
     </div>
     <button class="modal-close is-large close-modal" aria-label="close"></button>

web/templates/errors/500.html.tera

@@ -5,5 +5,5 @@
     {% set show_contact = True %}
 
     {% set page_title = "An Error Has Occurred" %}
-    {% set page_subtitle = "A server error has occurred. Please contact me and I will try and resolve this" %}
+    {% set page_subtitle = "A server error has occurred. Please retry, or ask in our Discord." %}
 {% endblock %}

web/templates/help.html.tera

@@ -93,6 +93,65 @@
                 </article>
             </div>
         </div>
+        <div class="tile is-ancestor">
+            <div class="tile is-parent">
+                <article class="tile is-child notification">
+                    <p class="title">Intervals</p>
+                    <p class="subtitle">Learn about repeating reminders</p>
+                    <div class="content has-text-centered">
+                        <a class="button is-size-4 is-rounded is-light" href="/help/intervals">
+                            <p class="is-size-4">
+                                Read <span class="icon"><i class="fas fa-chevron-right"></i></span>
+                            </p>
+                        </a>
+                    </div>
+                </article>
+            </div>
+            <div class="tile is-parent">
+                <article class="tile is-child notification">
+                    <p class="title">Dashboard</p>
+                    <p class="subtitle">Learn to use the interactive web dashboard</p>
+                    <div class="content has-text-centered">
+                        <a class="button is-size-4 is-rounded is-light" href="/help/dashboard">
+                            <p class="is-size-4">
+                                Read <span class="icon"><i class="fas fa-chevron-right"></i></span>
+                            </p>
+                        </a>
+                    </div>
+                </article>
+            </div>
+            <div class="tile is-parent is-vertical">
+                <article class="tile is-child notification">
+                    <p class="title">Import/Export</p>
+                    <p class="subtitle">Learn how to import and export data from the dashboard</p>
+                    <div class="content has-text-centered">
+                        <a class="button is-size-4 is-rounded is-light" href="/help/iemanager">
+                            <p class="is-size-4">
+                                Read <span class="icon"><i class="fas fa-chevron-right"></i></span>
+                            </p>
+                        </a>
+                    </div>
+                </article>
+            </div>
+        </div>
     </div>
 
+    <section class="hero is-small">
+        <div class="hero-body">
+            <div class="container has-text-centered">
+                <p class="title">Need more help?</p>
+                <p class="content">
+                    Feel free to come and ask us!
+                </p>
+            </div>
+        </div>
+        <div class="hero-foot has-text-centered">
+            <a class="button is-size-6 is-rounded is-primary" href="https://discord.jellywx.com">
+                <p class="is-size-6">
+                    Join Discord <span class="icon"><i class="fas fa-chevron-right"></i></span>
+                </p>
+            </a>
+        </div>
+    </section>
+
 {% endblock %}

web/templates/privacy.html.tera

@@ -49,7 +49,7 @@
         <div class="container">
             <h2 class="title">Who your data is shared with</h2>
             <p class="is-size-5 pl-6">
-                Your data may also be guarded by the privacy policies of <strong>MEGA</strong>, our backup provider, and
+                Your data is also guarded by the privacy policies of <strong>MEGA</strong>, our backup provider, and
                 <strong>Hetzner</strong>, our hosting provider.
             </p>
         </div>
@@ -68,7 +68,7 @@
                 <br>
                 <br>
                 Reminders deleted with <strong>/del</strong> or via the dashboard are removed from the live database
-                instantly, but may persist in backups.
+                instantly, but may persist in backups for up to a year.
             </p>
         </div>
     </section>

web/templates/reminder_dashboard/guild_reminder.html.tera

@@ -158,9 +158,9 @@
         </div>
 
         <div class="collapses">
-            <div class="is-locked">
+            <div class="patreon-only">
                 <div class="field">
-                    <label class="label">Interval <a class="foreground" href="/help/interval"><i class="fas fa-question-circle"></i></a></label>
+                    <label class="label">Interval <a class="foreground" href="/help/intervals"><i class="fas fa-question-circle"></i></a></label>
                     <div class="control intervalSelector" style="min-width: 400px;" >
                         <div class="input interval-group">
                             <div class="interval-group-left">
@@ -206,11 +206,6 @@
                         <label class="label">Enable TTS <input type="checkbox" name="tts"></label>
                     </div>
                 </div>
-                <div class="column has-text-centered">
-                    <div class="is-boxed">
-                        <label class="label">Pin Message <input type="checkbox" name="pin"></label>
-                    </div>
-                </div>
                 <div class="column has-text-centered">
                     <div class="file is-small is-boxed">
                         <label class="file-label">

web/templates/support/dashboard.html.tera

@@ -0,0 +1,22 @@
+{% extends "base" %}
+
+{% block init %}
+    {% set title = "Support" %}
+
+    {% set page_title = "Dashboard" %}
+    {% set page_subtitle = "" %}
+{% endblock %}
+
+{% block content %}
+
+    <section class="hero is-small">
+        <div class="hero-body">
+            <div class="container">
+                <p class="title">Accessing the dashboard</p>
+                <p class="content">
+                </p>
+            </div>
+        </div>
+    </section>
+
+{% endblock %}

web/templates/support/delete_reminder.html.tera

@@ -33,6 +33,24 @@
         </div>
     </section>
 
+    <section class="hero is-small">
+        <div class="hero-body">
+            <div class="container">
+                <p class="title">Deleting reminders you've just created</p>
+                <p class="content">
+                    If you made a mistake, you can quickly delete a reminder you made by pressing "Cancel"
+                    <br>
+                </p>
+                <figure>
+                    <img src="/static/img/support/delete_reminder/cancel-1.png" alt="Cancel button">
+                </figure>
+                <figure>
+                    <img src="/static/img/support/delete_reminder/cancel-2.png" alt="Reminder deleted">
+                </figure>
+            </div>
+        </div>
+    </section>
+
     <section class="hero is-small">
         <div class="hero-body">
             <div class="container">

web/templates/support/iemanager.html.tera

@@ -0,0 +1,88 @@
+{% extends "base" %}
+
+{% block init %}
+    {% set title = "Support" %}
+
+    {% set page_title = "Import/Export" %}
+    {% set page_subtitle = "" %}
+{% endblock %}
+
+{% block content %}
+
+    <section class="hero is-small">
+        <div class="hero-body">
+            <div class="container">
+                <p class="title">Export your data</p>
+                <p class="content">
+                    You can export data associated with your server from the dashboard. The data will export as a CSV
+                    file. The CSV file can then be edited and imported to bulk edit server data.
+                </p>
+            </div>
+        </div>
+    </section>
+
+    <section class="hero is-small">
+        <div class="hero-body">
+            <div class="container">
+                <p class="title">Import data</p>
+                <p class="content">
+                    You can import previous exports or modified exports. When importing a file, <strong>existing data
+                    will be overwritten</strong>.
+                </p>
+            </div>
+        </div>
+    </section>
+
+    <section class="hero is-small">
+        <div class="hero-body">
+            <div class="container content">
+                <p class="title">Edit your data</p>
+                <p>
+                    The CSV can be edited either as a text file or in a spreadsheet editor such as LibreOffice Calc. To
+                    set up LibreOffice Calc for editing, do the following:
+                </p>
+                <ol>
+                    <li>
+                        Export data from dashboard.
+                        <figure>
+                            <img src="/static/img/support/iemanager/select_export.png" alt="Selecting export button">
+                        </figure>
+                    </li>
+                    <li>
+                        Open the file in LibreOffice. <strong>During the import dialogue, select "Format quoted field as text".</strong>
+                        <figure>
+                            <img src="/static/img/support/iemanager/format_text.png" alt="Selecting format button">
+                        </figure>
+                    </li>
+                    <li>
+                        Make edits to the spreadsheet. You can add, edit, and remove rows for reminders. Don't remove the title row.
+                        <figure>
+                            <img src="/static/img/support/iemanager/edit_spreadsheet.png" alt="Editing spreadsheet">
+                        </figure>
+                    </li>
+                    <li>
+                        Save the edited CSV file and import it on the dashboard.
+                        <figure>
+                            <img src="/static/img/support/iemanager/import.png" alt="Import new reminders">
+                        </figure>
+                    </li>
+                </ol>
+                Other spreadsheet tools can also be used to edit exports, as long as they are properly configured:
+                <ul>
+                    <li>
+                        <strong>Google Sheets</strong>: Create a new blank spreadsheet. Select <strong>File >> Import >> Upload >> export.csv</strong>.
+                        Use the following import settings:
+                        <figure>
+                            <img src="/static/img/support/iemanager/sheets_settings.png" alt="Google sheets import settings">
+                        </figure>
+                    </li>
+                    <li>
+                        <strong>Excel (including Excel Online)</strong>: Avoid using Excel. Excel will not correctly import channels, or give
+                        clear options to correct imports.
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </section>
+
+{% endblock %}

web/templates/support/intervals.html.tera

@@ -0,0 +1,70 @@
+{% extends "base" %}
+
+{% block init %}
+    {% set title = "Support" %}
+
+    {% set page_title = "Intervals" %}
+    {% set page_subtitle = "Interval reminders, or repeating reminders, are available to our Patreon supporters" %}
+{% endblock %}
+
+{% block content %}
+
+    <section class="hero is-small">
+        <div class="hero-body">
+            <div class="container">
+                <p class="title">Fixed intervals</p>
+                <p class="content">
+                    The main type of interval is the fixed interval. Fixed intervals are ideal for hourly, daily, or
+                    reminders repeating at any other fixed amount of time.
+                    <br>
+                    You can create fixed interval reminders via the dashboard or via the <code>/remind</code> command.
+                    When you have filled out the "time" and "content" on the command, press <kbd>tab</kbd>. Select the
+                    "interval" option. Then, write the interval you wish to use: for example, "1 day" for daily (starting
+                    at the time specified in "time").
+                </p>
+            </div>
+        </div>
+    </section>
+
+    <section class="hero is-small">
+        <div class="hero-body">
+            <div class="container">
+                <p class="title">Daylight savings</p>
+                <p class="content">
+                    If you live in a region that uses daylight savings (DST), then your interval reminders may become
+                    offset by an hour due to clock changes.
+                    <br>
+                    Reminder Bot offers a quick solution to this via the <code>/offset</code> command. This command
+                    moves all existing reminders on a server by a certain amount of time. You can use offset to move
+                    your reminders forward or backward by an hour when daylight savings happens.
+                </p>
+            </div>
+        </div>
+    </section>
+
+    <section class="hero is-small">
+        <div class="hero-body">
+            <div class="container">
+                <p class="title">Monthly/yearly intervals</p>
+                <p class="content">
+                    Monthly or yearly intervals are configured the same as fixed intervals. Instead of a fixed time
+                    interval, these reminders repeat on a certain day each month or each year. This makes them ideal
+                    for marking certain dates.
+                </p>
+            </div>
+        </div>
+    </section>
+
+    <section class="hero is-small">
+        <div class="hero-body">
+            <div class="container">
+                <p class="title">Interval expiration</p>
+                <p class="content">
+                    An expiration time can also be specified, both via commands and dashboard, for repeating reminders.
+                    This is optional, and if omitted, the reminder will repeat indefinitely.
+                </p>
+            </div>
+        </div>
+    </section>
+
+{% endblock %}

web/templates/support/timezone.html.tera

@@ -3,8 +3,8 @@
 {% block init %}
     {% set title = "Support" %}
 
-    {% set page_title = "Timezone Help" %}
+    {% set page_title = "Timezones" %}
-    {% set page_subtitle = "Timezones are tricky. Read on for help" %}
+    {% set page_subtitle = "" %}
     {% set show_invite = false %}
 {% endblock %}
 
@@ -31,7 +31,7 @@
             <div class="container">
                 <p class="title">Selecting your timezone automatically</p>
                 <p class="content">
-                    A new feature we offer is the ability to configure Reminder Bot's timezone from your browser. To do
+                    You can also configure Reminder Bot's timezone from your browser. To do
                     this, go to our dashboard, press 'Timezone' in the bottom left (desktop) or at the bottom of the
                     navigation menu (mobile). Then, choose 'Set Bot Timezone' to set Reminder Bot to use your browser's
                     timezone.

web/templates/terms.html.tera

@@ -20,11 +20,12 @@
                 <br>
                 Violating the Terms of Service may result in receiving a permanent ban from the Discord server,
                 permanent restriction on your usage of Reminder Bot, or removal of some or all of your content on
-                Reminder Bot or the Discord server.
+                Reminder Bot or the Discord server. None of these will necessarily be preceded or succeeded by a warning
+                or notice.
                 <br>
                 <br>
-                The Terms of Service may be updated at any time, and should be considered a guideline for appropriate
+                The Terms of Service may be updated. Notice will be provided via the Discord server. You
-                behaviour.
+                should consider the Terms of Service to be a strong for appropriate behaviour.
             </p>
         </div>
     </section>
@@ -35,7 +36,14 @@
             <ul class="is-size-5 pl-6">
                 <li>Reasonably disclose potential exploits or bugs to me by email or by Discord private message</li>
                 <li>Do not use the bot to harass other Discord users</li>
-                <li>Do not use the bot to send more than 30 messages during a 60 second period</li>
+                <li>Do not use the bot to transmit malware or other illegal content</li>
+                <li>Do not use the bot to send more than 15 messages during a 60 second period</li>
+                <li>
+                    Do not attempt to circumvent restrictions imposed by the bot or website, including trying to access
+                    data of other users, circumvent Patreon restrictions, or uploading files and creating reminders that
+                    are too large for the bot to send or process. Some or all of these actions may be illegal in your
+                    country
+                </li>
             </ul>
         </div>
     </section>