mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
subsitute user and char variable in world info keywords
This commit is contained in:
@@ -506,16 +506,18 @@ function checkWorldInfo(chat) {
|
|||||||
|
|
||||||
if (Array.isArray(entry.key) && entry.key.length) {
|
if (Array.isArray(entry.key) && entry.key.length) {
|
||||||
primary: for (let key of entry.key) {
|
primary: for (let key of entry.key) {
|
||||||
if (key && textToScan.includes(key.trim().toLowerCase())) {
|
const substituted = substituteParams(key);
|
||||||
|
if (substituted && textToScan.includes(substituted.trim().toLowerCase())) {
|
||||||
if (
|
if (
|
||||||
entry.selective &&
|
entry.selective &&
|
||||||
Array.isArray(entry.keysecondary) &&
|
Array.isArray(entry.keysecondary) &&
|
||||||
entry.keysecondary.length
|
entry.keysecondary.length
|
||||||
) {
|
) {
|
||||||
secondary: for (let keysecondary of entry.keysecondary) {
|
secondary: for (let keysecondary of entry.keysecondary) {
|
||||||
|
const secondarySubstituted = substituteParams(keysecondary);
|
||||||
if (
|
if (
|
||||||
keysecondary &&
|
secondarySubstituted &&
|
||||||
textToScan.includes(keysecondary.trim().toLowerCase())
|
textToScan.includes(secondarySubstituted.trim().toLowerCase())
|
||||||
) {
|
) {
|
||||||
activatedNow.add(entry.uid);
|
activatedNow.add(entry.uid);
|
||||||
break secondary;
|
break secondary;
|
||||||
|
Reference in New Issue
Block a user