From 88c48302091db718eba7f6fe5ccae5e787bd91ff Mon Sep 17 00:00:00 2001
From: jude <jude@jellywx.com>
Date: Sat, 22 Jul 2023 13:34:18 +0100
Subject: [PATCH] Fix dashboard embed fields

---
 web/src/routes/dashboard/guild.rs | 2 +-
 web/static/js/main.js             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/src/routes/dashboard/guild.rs b/web/src/routes/dashboard/guild.rs
index 7af714e..e695fc5 100644
--- a/web/src/routes/dashboard/guild.rs
+++ b/web/src/routes/dashboard/guild.rs
@@ -340,7 +340,7 @@ pub async fn get_reminders(id: u64, ctx: &State<Context>, pool: &State<Pool<MySq
                  reminders.embed_image_url,
                  reminders.embed_thumbnail_url,
                  reminders.embed_title,
-                 reminders.embed_fields,
+                 IFNULL(reminders.embed_fields, '[]') AS embed_fields,
                  reminders.enabled,
                  reminders.expires,
                  reminders.interval_seconds,
diff --git a/web/static/js/main.js b/web/static/js/main.js
index 406baa2..912cbc1 100644
--- a/web/static/js/main.js
+++ b/web/static/js/main.js
@@ -214,6 +214,7 @@ async function serialize_reminder(node, mode) {
         utc_time = luxon.DateTime.fromISO(
             node.querySelector('input[name="time"]').value
         ).setZone("UTC");
+
         if (utc_time.invalid) {
             return { error: "Time provided invalid." };
         } else {
@@ -368,7 +369,7 @@ function deserialize_reminder(reminder, frame, mode) {
 
     const lastChild = frame.querySelector("div.embed-multifield-box .embed-field-box");
 
-    for (let field of reminder["embed_fields"]) {
+    for (let field of reminder["embed_fields"] || []) {
         let embed_field = $embedFieldTemplate.content.cloneNode(true);
         embed_field.querySelector("textarea.discord-field-title").value = field["title"];
         embed_field.querySelector("textarea.discord-field-value").value = field["value"];