From caa4cd234fea853a280e4b75d2b42d2db0331d73 Mon Sep 17 00:00:00 2001
From: Russell Ballestrini <russell.ballestrini@coursemojo.com>
Date: Tue, 12 Dec 2023 13:52:05 -0500
Subject: [PATCH] consolidate around data.content instead of message 
 modified:   app.py 	modified:   templates/chat.html

---
 app.py              | 2 +-
 templates/chat.html | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app.py b/app.py
index b1a68fa..d1d89a2 100644
--- a/app.py
+++ b/app.py
@@ -132,7 +132,7 @@ def on_join(data):
             {
                 "id": message.id,
                 "username": message.username,
-                "message": message.content,
+                "content": message.content,
             },
             room=request.sid,
         )
diff --git a/templates/chat.html b/templates/chat.html
index 5be4a6c..b324200 100644
--- a/templates/chat.html
+++ b/templates/chat.html
@@ -321,15 +321,15 @@ socket.on("previous_messages", (data) => {
     newMessage.className = "message-content";
 
     // Check if the message contains a base64 image
-    if (data.message.startsWith('<img src="data:image/jpeg;base64')) {
+    if (data.content.startsWith('<img src="data:image/jpeg;base64')) {
         // Directly assign the message as innerHTML if it's a base64 image
-        newMessage.innerHTML = data.message;
+        newMessage.innerHTML = data.content;
     } else {
         // Otherwise, sanitize and process the message with marked
-        newMessage.innerHTML = DOMPurify.sanitize(marked.marked(`**${data.username}:**\n\n${data.message}`), dompurify_config);
+        newMessage.innerHTML = DOMPurify.sanitize(marked.marked(`**${data.username}:**\n\n${data.content}`), dompurify_config);
     }
 
-    newMessage.dataset.rawMarkdown = data.message;
+    newMessage.dataset.rawMarkdown = data.content;
 
     // Create the delete button
     const deleteButton = document.createElement("button");
@@ -337,7 +337,6 @@ socket.on("previous_messages", (data) => {
     deleteButton.onclick = () => deleteMessage(data.id, room_name);
     messageWrapper.appendChild(deleteButton);
 
-
     // Create the edit button
     const editButton = document.createElement("button");
     editButton.textContent = "Edit";