Move message content to message_json

src/models/reminder/mod.rs

@@ -49,6 +49,7 @@ pub struct Reminder {
     pub interval_months: Option<u32>,
     pub expires: Option<NaiveDateTime>,
     pub enabled: bool,
+    pub message_json: Option<sqlx::types::Json<serde_json::Value>>,
     pub content: String,
     pub embed_description: String,
     pub set_by: Option<u64>,
@@ -83,6 +84,7 @@ impl Reminder {
                 reminders.interval_months,
                 reminders.expires,
                 reminders.enabled,
+                reminders.message_json,
                 reminders.content,
                 reminders.embed_description,
                 reminders.set_by
@@ -116,6 +118,7 @@ impl Reminder {
                 reminders.interval_months,
                 reminders.expires,
                 reminders.enabled,
+                reminders.message_json,
                 reminders.content,
                 reminders.embed_description,
                 reminders.set_by
@@ -156,6 +159,7 @@ impl Reminder {
                 reminders.interval_months,
                 reminders.expires,
                 reminders.enabled,
+                reminders.message_json,
                 reminders.content,
                 reminders.embed_description,
                 reminders.set_by
@@ -215,6 +219,7 @@ impl Reminder {
                             reminders.interval_months,
                             reminders.expires,
                             reminders.enabled,
+                            reminders.message_json,
                             reminders.content,
                             reminders.embed_description,
                             reminders.set_by
@@ -251,6 +256,7 @@ impl Reminder {
                             reminders.interval_months,
                             reminders.expires,
                             reminders.enabled,
+                            reminders.message_json,
                             reminders.content,
                             reminders.embed_description,
                             reminders.set_by
@@ -284,6 +290,7 @@ impl Reminder {
                     reminders.interval_months,
                     reminders.expires,
                     reminders.enabled,
+                    reminders.message_json,
                     reminders.content,
                     reminders.embed_description,
                     reminders.set_by
@@ -321,6 +328,13 @@ impl Reminder {
     }
 
     pub fn display_content(&self) -> &str {
+        if let Some(message) = &self.message_json {
+            let content = message["content"].as_str().unwrap_or_default();
+            if !content.is_empty() {
+                return content;
+            }
+            return message["embeds"][0]["description"].as_str().unwrap_or_default();
+        }
         if self.content.is_empty() {
             &self.embed_description
         } else {