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

Merge branch 'main' into dev

Browse Source
This commit is contained in:
SillyLossy
2023-05-21 00:10:26 +03:00
parent 299b9a04bc 039244c749
commit 1253d04561
6 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/scripts/world-info.js
View File

@@ -506,16 +506,18 @@ function checkWorldInfo(chat) {
if (Array.isArray(entry.key) && entry.key.length) {
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 (
entry.selective &&
Array.isArray(entry.keysecondary) &&
entry.keysecondary.length
) {
secondary: for (let keysecondary of entry.keysecondary) {
const secondarySubstituted = substituteParams(keysecondary);
if (
keysecondary &&
textToScan.includes(keysecondary.trim().toLowerCase())
secondarySubstituted &&
textToScan.includes(secondarySubstituted.trim().toLowerCase())
) {
activatedNow.add(entry.uid);
break secondary;
@@ -686,4 +688,4 @@ $(document).ready(() => {
world_info_recursive = !!$(this).prop('checked');
saveSettingsDebounced();
})
});
});