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

Unify {{pick}} and {{random}} regex

Browse Source 
- Allow all four possible syntax forms, just to make this easier: {{random:1️⃣:two}}, {{random1️⃣:two}}, {{random::one,two}} and {{random:one,two}}
This commit is contained in:
Wolfsblvt 2024-04-02 00:42:13 +02:00
parent 03a203d607
commit 9b24397f5a
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/scripts/macros.js
View File

@ -185,8 +185,7 @@ function getTimeSinceLastMessage() {
}
function randomReplace(input, emptyListPlaceholder = '') {
const randomPatternNew = /{{random\s?::\s?([^}]+)}}/gi;
const randomPatternOld = /{{random\s?:\s?([^}]+)}}/gi;
const randomPatternNew = /{{random\s?::?\s?([^}]+)}}/gi;
input = input.replace(randomPatternNew, (match, listString) => {
//split on double colons instead of commas to allow for commas inside random items
@ -202,20 +201,11 @@ function randomReplace(input, emptyListPlaceholder = '') {
//trim() at the end to allow for empty random values
return list[randomIndex].trim();
});
input = input.replace(randomPatternOld, (match, listString) => {
const list = listString.split(',').map(item => item.trim()).filter(item => item.length > 0);
if (list.length === 0) {
return emptyListPlaceholder;
}
const rng = new Math.seedrandom('added entropy.', { entropy: true });
const randomIndex = Math.floor(rng() * list.length);
return list[randomIndex];
});
return input;
}
function pickReplace(input, rawContent, emptyListPlaceholder = '') {
const pickPattern = /{{pick\s?::\s?([^}]+)}}/gi;
const pickPattern = /{{pick\s?::?\s?([^}]+)}}/gi;
const chatIdHash = getStringHash(getCurrentChatId());
const rawContentHash = getStringHash(rawContent);