mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Merge branch 'staging' into wi-no-doube-substitution
This commit is contained in:
commit
18d96bc346
@ -2535,6 +2535,11 @@ async function checkWorldInfo(chat, maxContext) {
|
|||||||
const regexDepth = entry.position === world_info_position.atDepth ? (entry.depth ?? DEFAULT_DEPTH) : null;
|
const regexDepth = entry.position === world_info_position.atDepth ? (entry.depth ?? DEFAULT_DEPTH) : null;
|
||||||
const content = getRegexedString(entry.content, regex_placement.WORLD_INFO, { depth: regexDepth, isMarkdown: false, isPrompt: true });
|
const content = getRegexedString(entry.content, regex_placement.WORLD_INFO, { depth: regexDepth, isMarkdown: false, isPrompt: true });
|
||||||
|
|
||||||
|
if (!content) {
|
||||||
|
console.debug('Skipping adding WI entry to prompt due to empty content:', entry);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
switch (entry.position) {
|
switch (entry.position) {
|
||||||
case world_info_position.before:
|
case world_info_position.before:
|
||||||
WIBeforeEntries.unshift(substituteParams(content));
|
WIBeforeEntries.unshift(substituteParams(content));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user