Store guild when creating reminders

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

Cargo.lock

@@ -2217,7 +2217,7 @@ checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "reminder-rs"
-version = "1.6.36"
+version = "1.6.38"
 dependencies = [
  "base64 0.21.2",
  "chrono",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reminder-rs"
-version = "1.6.36"
+version = "1.6.38"
 authors = ["Jude Southworth <judesouthworth@pm.me>"]
 edition = "2021"
 license = "AGPL-3.0 only"

migrations/20230812111348_orphan_reminders.sql

@@ -0,0 +1,19 @@
+-- Drop existing constraint
+ALTER TABLE `reminders` DROP CONSTRAINT `reminders_ibfk_1`;
+
+ALTER TABLE `reminders` MODIFY COLUMN `channel_id` INT UNSIGNED;
+ALTER TABLE `reminders` ADD COLUMN `guild_id` INT UNSIGNED;
+
+ALTER TABLE `reminders`
+    ADD CONSTRAINT `guild_id_fk`
+        FOREIGN KEY (`guild_id`)
+        REFERENCES `guilds`(`id`)
+        ON DELETE CASCADE;
+
+ALTER TABLE `reminders`
+    ADD CONSTRAINT `channel_id_fk`
+        FOREIGN KEY (`channel_id`)
+        REFERENCES `channels`(`id`)
+        ON DELETE SET NULL;
+
+UPDATE `reminders` SET `guild_id` = (SELECT guilds.`id` FROM `channels` INNER JOIN `guilds` ON channels.guild_id = guilds.id WHERE reminders.channel_id = channels.id);

src/component_models/mod.rs

@@ -169,7 +169,7 @@ impl ComponentDataModel {
                 let selected_id = component.data.values.join(",");
 
                 sqlx::query!(
-                    "UPDATE reminders SET `status` = 'pending' WHERE FIND_IN_SET(id, ?)",
+                    "UPDATE reminders SET `status` = 'deleted' WHERE FIND_IN_SET(id, ?)",
                     selected_id
                 )
                 .execute(&data.database)

src/models/channel_data.rs

@@ -10,6 +10,7 @@ pub struct ChannelData {
     pub webhook_id: Option<u64>,
     pub webhook_token: Option<String>,
     pub paused: bool,
+    pub db_guild_id: Option<u32>,
     pub paused_until: Option<NaiveDateTime>,
 }
 
@@ -22,7 +23,7 @@ impl ChannelData {
 
         if let Ok(c) = sqlx::query_as_unchecked!(
             Self,
-            "SELECT id, name, nudge, blacklisted, webhook_id, webhook_token, paused, paused_until FROM channels WHERE channel = ?",
+            "SELECT id, name, nudge, blacklisted, webhook_id, webhook_token, paused, paused_until, guild_id AS db_guild_id FROM channels WHERE channel = ?",
             channel_id
         )
         .fetch_one(pool)
@@ -46,7 +47,7 @@ impl ChannelData {
             Ok(sqlx::query_as_unchecked!(
                 Self,
                 "
-SELECT id, name, nudge, blacklisted, webhook_id, webhook_token, paused, paused_until FROM channels WHERE channel = ?
+SELECT id, name, nudge, blacklisted, webhook_id, webhook_token, paused, paused_until, guild_id AS db_guild_id FROM channels WHERE channel = ?
                 ",
                 channel_id
             )

src/models/reminder/builder.rs

@@ -51,6 +51,7 @@ pub struct ReminderBuilder {
     pool: MySqlPool,
     uid: String,
     channel: u32,
+    guild: Option<u32>,
     thread_id: Option<u64>,
     utc_time: NaiveDateTime,
     timezone: String,
@@ -86,6 +87,7 @@ impl ReminderBuilder {
 INSERT INTO reminders (
     `uid`,
     `channel_id`,
+    `guild_id`,
     `utc_time`,
     `timezone`,
     `interval_seconds`,
@@ -110,11 +112,13 @@ INSERT INTO reminders (
     ?,
     ?,
     ?,
+    ?,
     ?
 )
             ",
                         self.uid,
                         self.channel,
+                        self.guild,
                         utc_time,
                         self.timezone,
                         self.interval_seconds,
@@ -247,10 +251,10 @@ impl<'a> MultiReminderBuilder<'a> {
                                 {
                                     Err(ReminderError::UserBlockedDm)
                                 } else {
-                                    Ok(user_data.dm_channel)
+                                    Ok((user_data.dm_channel, None))
                                 }
                             } else {
-                                Ok(user_data.dm_channel)
+                                Ok((user_data.dm_channel, None))
                             }
                         } else {
                             Err(ReminderError::InvalidTag)
@@ -297,13 +301,13 @@ impl<'a> MultiReminderBuilder<'a> {
                                                 .commit_changes(&self.ctx.data().database)
                                                 .await;
 
-                                            Ok(channel_data.id)
+                                            Ok((channel_data.id, channel_data.db_guild_id))
                                         }
 
                                         Err(e) => Err(ReminderError::DiscordError(e.to_string())),
                                     }
                                 } else {
-                                    Ok(channel_data.id)
+                                    Ok((channel_data.id, channel_data.db_guild_id))
                                 }
                             }
                         } else {
@@ -317,7 +321,8 @@ impl<'a> MultiReminderBuilder<'a> {
                         let builder = ReminderBuilder {
                             pool: self.ctx.data().database.clone(),
                             uid: generate_uid(),
-                            channel: c,
+                            channel: c.0,
+                            guild: c.1,
                             thread_id,
                             utc_time: self.utc_time,
                             timezone: self.timezone.to_string(),

web/src/lib.rs

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

web/src/macros.rs

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

web/src/routes/dashboard/guild.rs

@@ -26,7 +26,7 @@ use crate::{
     routes::{
         dashboard::{
             create_database_channel, create_reminder, template_name_default, DeleteReminder,
-            DeleteReminderTemplate, PatchReminder, Reminder, ReminderTemplate,
+            DeleteReminderTemplate, PatchReminder, Reminder, ReminderError, ReminderTemplate,
         },
         JsonResult,
     },
@@ -46,6 +46,7 @@ pub async fn get_guild_patreon(
     cookies: &CookieJar<'_>,
     ctx: &State<Context>,
 ) -> JsonResult {
+    offline!(Ok(json!({ "patreon": true })));
     check_authorization!(cookies, ctx.inner(), id);
 
     match GuildId(id).to_guild_cached(ctx.inner()) {
@@ -73,6 +74,12 @@ pub async fn get_guild_channels(
     cookies: &CookieJar<'_>,
     ctx: &State<Context>,
 ) -> JsonResult {
+    offline!(Ok(json!(vec![ChannelInfo {
+        name: "general".to_string(),
+        id: "1".to_string(),
+        webhook_avatar: None,
+        webhook_name: None,
+    }])));
     check_authorization!(cookies, ctx.inner(), id);
 
     match GuildId(id).to_guild_cached(ctx.inner()) {
@@ -111,6 +118,7 @@ struct RoleInfo {
 
 #[get("/api/guild/<id>/roles")]
 pub async fn get_guild_roles(id: u64, cookies: &CookieJar<'_>, ctx: &State<Context>) -> JsonResult {
+    offline!(Ok(json!(vec![RoleInfo { name: "@everyone".to_string(), id: "1".to_string() }])));
     check_authorization!(cookies, ctx.inner(), id);
 
     let roles_res = ctx.cache.guild_roles(id);
@@ -314,23 +322,11 @@ pub async fn create_guild_reminder(
 pub async fn get_reminders(
     id: u64,
     cookies: &CookieJar<'_>,
-    ctx: &State<Context>,
     serenity_context: &State<Context>,
     pool: &State<Pool<MySql>>,
 ) -> JsonResult {
     check_authorization!(cookies, serenity_context.inner(), id);
 
-    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(",");
-
     sqlx::query_as_unchecked!(
         Reminder,
         "SELECT
@@ -362,8 +358,8 @@ pub async fn get_reminders(
          reminders.utc_time
         FROM reminders
         LEFT JOIN channels ON channels.id = reminders.channel_id
-                WHERE `status` = 'pending' AND FIND_IN_SET(channels.channel, ?)",
-                channels
+        WHERE `status` = 'pending' AND reminders.guild_id = (SELECT id FROM guilds WHERE guild = ?)",
+        id
     )
     .fetch_all(pool.inner())
     .await
@@ -373,13 +369,6 @@ pub async fn get_reminders(
 
         json_err!("Could not load reminders")
     })
-        }
-        Err(e) => {
-            warn!("Could not fetch channels from {}: {:?}", id, e);
-
-            Ok(json!([]))
-        }
-    }
 }
 
 #[patch("/api/guild/<id>/reminders", data = "<reminder>")]
@@ -615,3 +604,35 @@ pub async fn delete_reminder(
         }
     }
 }
+
+#[get("/api/guild/<id>/errors")]
+pub async fn get_reminder_errors(
+    id: u64,
+    cookies: &CookieJar<'_>,
+    serenity_context: &State<Context>,
+    pool: &State<Pool<MySql>>,
+) -> JsonResult {
+    check_authorization!(cookies, serenity_context.inner(), id);
+
+    sqlx::query_as_unchecked!(
+        ReminderError,
+        "SELECT
+         reminders.status,
+         reminders.utc_time,
+         reminders.name,
+         reminders.uid,
+         reminders.channel_id AS channel
+        FROM reminders
+        LEFT JOIN channels ON channels.id = reminders.channel_id
+        WHERE (`status` != 'pending' OR reminders.channel_id IS NULL) AND reminders.guild_id = (SELECT id FROM guilds WHERE guild = ?)",
+        id
+    )
+    .fetch_all(pool.inner())
+    .await
+    .map(|r| Ok(json!(r)))
+    .unwrap_or_else(|e| {
+        warn!("Failed to complete SQL query: {:?}", e);
+
+        json_err!("Could not load reminders")
+    })
+}

web/src/routes/dashboard/mod.rs

@@ -152,6 +152,18 @@ pub struct Reminder {
     utc_time: NaiveDateTime,
 }
 
+#[derive(Serialize)]
+pub struct ReminderError {
+    #[serde(with = "string")]
+    channel: u64,
+    status: String,
+    #[serde(default = "name_default")]
+    name: String,
+    #[serde(default)]
+    uid: String,
+    utc_time: NaiveDateTime,
+}
+
 #[derive(Serialize, Deserialize)]
 pub struct ReminderCsv {
     #[serde(with = "base64s")]
@@ -479,6 +491,7 @@ pub async fn create_reminder(
          attachment,
          attachment_name,
          channel_id,
+         guild_id,
          avatar,
          content,
          embed_author,
@@ -501,11 +514,12 @@ pub async fn create_reminder(
          tts,
          username,
          `utc_time`
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
         new_uid,
         attachment_data,
         reminder.attachment_name,
         channel,
+        guild_id.0,
         reminder.avatar,
         reminder.content,
         reminder.embed_author,

web/src/routes/dashboard/user.rs

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

web/static/css/style.css

@@ -249,11 +249,11 @@ div#pageNavbar a {
 
 .navbar-item.pageTitle {
     flex-shrink: 1;
-    text-wrap: nowrap;
+    white-space: nowrap;
     overflow: hidden;
 }
 
-.navbar-burger, .navbar-burger:active, .navbar-burger.is-active {
+.dashboard-burger, .dashboard-burger:active, .dashboard-burger.is-active {
     background-color: #adc99c !important;
     border-radius: 14px;
     padding: 6px;
@@ -644,9 +644,11 @@ li.highlight {
     }
 
     p.title.pageTitle {
-        visibility: hidden;
-        text-wrap: nowrap;
-        overflow: hidden;
+        display: none;
+    }
+
+    .dashboard-frame {
+        margin-top: 4rem !important;
     }
 }
 
@@ -665,6 +667,7 @@ li.highlight {
 /* loader */
 #loader {
     position: fixed;
+    top: 0;
     background-color: rgba(255, 255, 255, 0.8);
     width: 100vw;
     z-index: 999;
@@ -719,9 +722,20 @@ a.switch-pane {
 
 .is-locked {
     pointer-events: none;
+}
+
+.is-locked > :not(.patreon-invert) {
     opacity: 0.4;
 }
 
+.is-locked .patreon-invert {
+    display: block;
+}
+
+.patreon-invert {
+    display: none;
+}
+
 .is-locked .foreground {
     pointer-events: auto;
 }
@@ -751,5 +765,5 @@ a.switch-pane {
 }
 
 .figure-num {
-    font-size: 2em;
+    font-size: 2rem;
 }

web/static/js/reminder_errors.js

@@ -0,0 +1,19 @@
+let _reminderErrors = [];
+
+const reminderErrors = () => {
+    return _reminderErrors;
+}
+
+const guildId = () => {
+    let selected = document.querySelector(".guildList a.is-active");
+    return selected.dataset["guild"];
+}
+
+
+function loadErrors() {
+    fetch(`/dashboard/api/guild/${guildId()}/errors`).then(response => response.json())
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+
+})

web/static/js/reminder_errors.ts

@@ -0,0 +1,19 @@
+let _reminderErrors = [];
+
+const reminderErrors = () => {
+    return _reminderErrors;
+}
+
+const guildId = () => {
+    let selected: HTMLElement = document.querySelector(".guildList a.is-active");
+    return selected.dataset["guild"];
+}
+
+
+function loadErrors() {
+    fetch(`/dashboard/api/guild/${guildId()}/errors`).then(response => response.json())
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+
+})

web/templates/dashboard.html.tera

@@ -47,7 +47,7 @@
         <p class="navbar-item pageTitle">
         </p>
 
-        <a role="button" class="navbar-burger is-right" aria-label="menu" aria-expanded="false"
+        <a role="button" class="dashboard-burger navbar-burger is-right" aria-label="menu" aria-expanded="false"
            data-target="mobileSidebar">
             <span aria-hidden="true"></span>
             <span aria-hidden="true"></span>
@@ -335,34 +335,14 @@
         <section id="guild" class="is-hidden">
             {% include "reminder_dashboard/reminder_dashboard" %}
         </section>
-        <section id="guild-error" class="is-hidden hero is-fullheight">
-            <div class="hero-body">
-                <div class="container has-text-centered">
-                    <p class="title">
-                        We couldn't get this server's data
-                    </p>
-                    <p class="subtitle">
-                        Please check Reminder Bot is in the server, and has correct permissions.
-                    </p>
-                    <a class="button is-size-4 is-rounded is-success" href="https://invite.reminder-bot.com">
-                        <p class="is-size-4">
-                            <span>Add to Server</span> <span class="icon"><i class="fas fa-chevron-right"></i></span>
-                        </p>
-                    </a>
-                </div>
-            </div>
+        <section id="reminder-errors" class="is-hidden">
+            {% include "reminder_dashboard/reminder_errors" %}
         </section>
-        <section id="user-error" class="is-hidden hero is-fullheight">
-            <div class="hero-body">
-                <div class="container has-text-centered">
-                    <p class="title">
-                        You do not have permissions for this server
-                    </p>
-                    <p class="subtitle">
-                        Ask an admin to grant you the "Manage Messages" permission.
-                    </p>
-                </div>
-            </div>
+        <section id="guild-error" class="is-hidden">
+            {% include "reminder_dashboard/guild_error" %}
+        </section>
+        <section id="user-error" class="is-hidden">
+            {% include "reminder_dashboard/user_error" %}
         </section>
     </div>
     <!-- /main content -->

web/templates/reminder_dashboard/guild_error.html.tera

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

web/templates/reminder_dashboard/guild_reminder.html.tera

@@ -165,6 +165,9 @@
             <div class="collapses split-controls">
                 <div>
                     <div class="patreon-only">
+                        <div class="patreon-invert foreground">
+                            Intervals available on <a href="https://patreon.com/jellywx">Patreon</a> or <a href="https://gitea.jellypro.xyz/jude/reminder-bot">self-hosting</a>
+                        </div>
                         <div class="field">
                             <label class="label">Interval <a class="foreground" href="/help/intervals"><i class="fas fa-question-circle"></i></a></label>
                             <div class="control intervalSelector">

web/templates/reminder_dashboard/reminder_errors.html.tera

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

web/templates/reminder_dashboard/user_error.html.tera

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