Merge pull request SillyTavern#3731 from SillyTavern/fix-srw-trim

Cohee1207 · web-flow · commit e3c465258e6b · 2025-03-20T10:37:46.000+02:00
Fix replacing user_prompt_bias on display
diff --git a/public/script.js b/public/script.js
@@ -2069,8 +2069,9 @@ export function messageFormatting(mes, ch_name, isSystem, isUser, messageId, san
     }
 
     // Prompt bias replacement should be applied on the raw message
-    if (!power_user.show_user_prompt_bias && ch_name && !isUser && !isSystem) {
-        mes = mes.replaceAll(substituteParams(power_user.user_prompt_bias), '');
+    const replacedPromptBias = power_user.user_prompt_bias && substituteParams(power_user.user_prompt_bias);
+    if (!power_user.show_user_prompt_bias && ch_name && !isUser && !isSystem && replacedPromptBias && mes.startsWith(replacedPromptBias)) {
+        mes = mes.slice(replacedPromptBias.length);
     }
 
     if (!isSystem) {

Original file line number	Diff line number	Diff line change
`@@ -2069,8 +2069,9 @@ export function messageFormatting(mes, ch_name, isSystem, isUser, messageId, san`
`2069`	`2069`	`}`
`2070`	`2070`
`2071`	`2071`	`// Prompt bias replacement should be applied on the raw message`
`2072`		`- if (!power_user.show_user_prompt_bias && ch_name && !isUser && !isSystem) {`
`2073`		`- mes = mes.replaceAll(substituteParams(power_user.user_prompt_bias), '');`
	`2072`	`+ const replacedPromptBias = power_user.user_prompt_bias && substituteParams(power_user.user_prompt_bias);`
	`2073`	`+ if (!power_user.show_user_prompt_bias && ch_name && !isUser && !isSystem && replacedPromptBias && mes.startsWith(replacedPromptBias)) {`
	`2074`	`+ mes = mes.slice(replacedPromptBias.length);`
`2074`	`2075`	`}`
`2075`	`2076`
`2076`	`2077`	`if (!isSystem) {`