consolidate around data.content instead of message
modified: app.py modified: templates/chat.html
This commit is contained in:
parent
b778c7e53c
commit
caa4cd234f
2 changed files with 5 additions and 6 deletions
2
app.py
2
app.py
|
|
@ -132,7 +132,7 @@ def on_join(data):
|
||||||
{
|
{
|
||||||
"id": message.id,
|
"id": message.id,
|
||||||
"username": message.username,
|
"username": message.username,
|
||||||
"message": message.content,
|
"content": message.content,
|
||||||
},
|
},
|
||||||
room=request.sid,
|
room=request.sid,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -321,15 +321,15 @@ socket.on("previous_messages", (data) => {
|
||||||
newMessage.className = "message-content";
|
newMessage.className = "message-content";
|
||||||
|
|
||||||
// Check if the message contains a base64 image
|
// 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
|
// Directly assign the message as innerHTML if it's a base64 image
|
||||||
newMessage.innerHTML = data.message;
|
newMessage.innerHTML = data.content;
|
||||||
} else {
|
} else {
|
||||||
// Otherwise, sanitize and process the message with marked
|
// 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
|
// Create the delete button
|
||||||
const deleteButton = document.createElement("button");
|
const deleteButton = document.createElement("button");
|
||||||
|
|
@ -337,7 +337,6 @@ socket.on("previous_messages", (data) => {
|
||||||
deleteButton.onclick = () => deleteMessage(data.id, room_name);
|
deleteButton.onclick = () => deleteMessage(data.id, room_name);
|
||||||
messageWrapper.appendChild(deleteButton);
|
messageWrapper.appendChild(deleteButton);
|
||||||
|
|
||||||
|
|
||||||
// Create the edit button
|
// Create the edit button
|
||||||
const editButton = document.createElement("button");
|
const editButton = document.createElement("button");
|
||||||
editButton.textContent = "Edit";
|
editButton.textContent = "Edit";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue