consolidate around data.content instead of message

modified:   app.py
	modified:   templates/chat.html
This commit is contained in:
Russell Ballestrini 2023-12-12 13:52:05 -05:00
parent b778c7e53c
commit caa4cd234f
2 changed files with 5 additions and 6 deletions

2
app.py
View file

@ -132,7 +132,7 @@ def on_join(data):
{
"id": message.id,
"username": message.username,
"message": message.content,
"content": message.content,
},
room=request.sid,
)

View file

@ -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";