Merge pull request #45 from joenunezb/fix/render-chat-message-properly

fix: Render chat messages using updateMessageBlock
This commit is contained in:
Spicy Marinara
2025-11-13 13:26:13 +01:00
committed by GitHub
+7 -11
View File
@@ -4,7 +4,7 @@
*/ */
import { getContext } from '../../../../../../extensions.js'; import { getContext } from '../../../../../../extensions.js';
import { chat, user_avatar, setExtensionPrompt, extension_prompt_types } from '../../../../../../../script.js'; import { chat, user_avatar, setExtensionPrompt, extension_prompt_types, updateMessageBlock } from '../../../../../../../script.js';
// Core modules // Core modules
import { import {
@@ -167,13 +167,9 @@ export async function onMessageReceived(data) {
renderQuests(); renderQuests();
// Then update the DOM to reflect the cleaned message // Then update the DOM to reflect the cleaned message
const lastMessageElement = $('#chat').children('.mes').last(); // Using updateMessageBlock to perform macro substitutions + regex formatting
if (lastMessageElement.length) { const messageId = chat.length - 1;
const messageText = lastMessageElement.find('.mes_text'); updateMessageBlock(messageId, lastMessage, { rerenderMessage: true });
if (messageText.length) {
messageText.html(substituteParams(cleanedMessage.trim()));
}
}
// console.log('[RPG Companion] Cleaned message, removed tracker code blocks from DOM'); // console.log('[RPG Companion] Cleaned message, removed tracker code blocks from DOM');
@@ -255,9 +251,9 @@ export function onMessageSwiped(messageIndex) {
// Only set flag to true if this swipe will trigger a NEW generation // Only set flag to true if this swipe will trigger a NEW generation
// Check if the swipe already exists (has content in the swipes array) // Check if the swipe already exists (has content in the swipes array)
const isExistingSwipe = message.swipes && const isExistingSwipe = message.swipes &&
message.swipes[currentSwipeId] !== undefined && message.swipes[currentSwipeId] !== undefined &&
message.swipes[currentSwipeId] !== null && message.swipes[currentSwipeId] !== null &&
message.swipes[currentSwipeId].length > 0; message.swipes[currentSwipeId].length > 0;
if (!isExistingSwipe) { if (!isExistingSwipe) {
// This is a NEW swipe that will trigger generation // This is a NEW swipe that will trigger generation