rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-02-10 00:50:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Escape commas in comma-separated random and pick

Browse Source
This commit is contained in:
Cohee 2024-06-02 15:02:54 +03:00
parent 65cf9c8f4d
commit d8949fddc7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/scripts/macros.js
View File

@ -197,7 +197,8 @@ function randomReplace(input, emptyListPlaceholder = '') {
// Split on either double colons or comma. If comma is the separator, we are also trimming all items. // Split on either double colons or comma. If comma is the separator, we are also trimming all items.
const list = listString.includes('::') const list = listString.includes('::')
? listString.split('::') ? listString.split('::')
: listString.split(',').map(item => item.trim()); // Replaced escaped commas with a placeholder to avoid splitting on them
: listString.replace(/\\,/g, '##<23>COMMA<4D>##').split(',').map(item => item.trim().replace(/##<23>COMMA<4D>##/g, ','));
if (list.length === 0) { if (list.length === 0) {
return emptyListPlaceholder; return emptyListPlaceholder;
@ -221,7 +222,8 @@ function pickReplace(input, rawContent, emptyListPlaceholder = '') {
// Split on either double colons or comma. If comma is the separator, we are also trimming all items. // Split on either double colons or comma. If comma is the separator, we are also trimming all items.
const list = listString.includes('::') const list = listString.includes('::')
? listString.split('::') ? listString.split('::')
: listString.split(',').map(item => item.trim()); // Replaced escaped commas with a placeholder to avoid splitting on them
: listString.replace(/\\,/g, '##<23>COMMA<4D>##').split(',').map(item => item.trim().replace(/##<23>COMMA<4D>##/g, ','));
if (list.length === 0) { if (list.length === 0) {
return emptyListPlaceholder; return emptyListPlaceholder;