rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

reverse compatibility for old random method

Browse Source
This commit is contained in:
RossAscends
2023-11-26 03:08:03 +09:00
parent 7264e3fe83
commit 9645034b09
1 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
public/script.js
View File

@ -2121,22 +2121,34 @@ function getTimeSinceLastMessage() {
} }
function randomReplace(input, emptyListPlaceholder = '') { function randomReplace(input, emptyListPlaceholder = '') {
const randomPattern = /{{random[ : ]([^}]+)}}/gi; const randomPatternNew = /{{random\s?::\s?([^}]+)}}/gi;
const randomPatternOld = /{{random\s?:\s?([^}]+)}}/gi;
return input.replace(randomPattern, (match, listString) => { if (randomPatternNew.test(input)) {
//split on double colons instead of commas to allow for commas inside random items return input.replace(randomPatternNew, (match, listString) => {
const list = listString.split('::').filter(item => item.length > 0); //split on double colons instead of commas to allow for commas inside random items
if (list.length === 0) { const list = listString.split('::').filter(item => item.length > 0);
return emptyListPlaceholder; if (list.length === 0) {
} return emptyListPlaceholder;
}
var rng = new Math.seedrandom('added entropy.', { entropy: true }); var rng = new Math.seedrandom('added entropy.', { entropy: true });
const randomIndex = Math.floor(rng() * list.length); const randomIndex = Math.floor(rng() * list.length);
//trim() at the end to allow for empty random values
//const randomIndex = Math.floor(Math.random() * list.length); return list[randomIndex].trim();
//trim() at the end to allow for empty random values });
return list[randomIndex].trim(); } else if (randomPatternOld.test(input)) {
}); return input.replace(randomPatternOld, (match, listString) => {
const list = listString.split(',').map(item => item.trim()).filter(item => item.length > 0);
if (list.length === 0) {
return emptyListPlaceholder;
}
var rng = new Math.seedrandom('added entropy.', { entropy: true });
const randomIndex = Math.floor(rng() * list.length);
return list[randomIndex];
});
} else {
return input
}
} }
function diceRollReplace(input, invalidRollPlaceholder = '') { function diceRollReplace(input, invalidRollPlaceholder = '') {
@ -8563,7 +8575,7 @@ jQuery(async function () {
if (this_chid !== undefined || selected_group) { if (this_chid !== undefined || selected_group) {
// Previously system messages we're allowed to be edited // Previously system messages we're allowed to be edited
/*const message = $(this).closest(".mes"); /*const message = $(this).closest(".mes");
if (message.data("isSystem")) { if (message.data("isSystem")) {
return; return;
}*/ }*/