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

Do not append empty joiners

Browse Source
This commit is contained in:
Cohee
2025-04-25 21:01:53 +03:00
parent 5c4794812f
commit 421c924c22
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,7 +158,7 @@ class WorldInfoBuffer {
/**
* @type {WIGlobalScanData} Chat independent data to be scanned, such as persona and character descriptions
*/
#globalScanDataBuffer = null;
#globalScanData = null;
/**
* @type {string[]} Array of messages sorted by ascending depth
@@ -192,7 +192,7 @@ class WorldInfoBuffer {
*/
constructor(messages, globalScanData) {
this.#initDepthBuffer(messages);
this.#globalScanDataBuffer = globalScanData;
this.#globalScanData = globalScanData;
}
/**
@@ -249,23 +249,23 @@ class WorldInfoBuffer {
const JOINER = '\n' + MATCHER;
let result = MATCHER + this.#depthBuffer.slice(this.#startDepth, depth).join(JOINER);
if (entry.matchPersonaDescription) {
result += JOINER + this.#globalScanDataBuffer.personaDescription;
if (entry.matchPersonaDescription && this.#globalScanData.personaDescription) {
result += JOINER + this.#globalScanData.personaDescription;
}
if (entry.matchCharacterDescription) {
result += JOINER + this.#globalScanDataBuffer.characterDescription;
if (entry.matchCharacterDescription && this.#globalScanData.characterDescription) {
result += JOINER + this.#globalScanData.characterDescription;
}
if (entry.matchCharacterPersonality) {
result += JOINER + this.#globalScanDataBuffer.characterPersonality;
if (entry.matchCharacterPersonality && this.#globalScanData.characterPersonality) {
result += JOINER + this.#globalScanData.characterPersonality;
}
if (entry.matchCharacterDepthPrompt) {
result += JOINER + this.#globalScanDataBuffer.characterDepthPrompt;
if (entry.matchCharacterDepthPrompt && this.#globalScanData.characterDepthPrompt) {
result += JOINER + this.#globalScanData.characterDepthPrompt;
}
if (entry.matchScenario) {
result += JOINER + this.#globalScanDataBuffer.scenario;
if (entry.matchScenario && this.#globalScanData.scenario) {
result += JOINER + this.#globalScanData.scenario;
}
if (entry.matchCreatorNotes) {
result += JOINER + this.#globalScanDataBuffer.creatorNotes;
if (entry.matchCreatorNotes && this.#globalScanData.creatorNotes) {
result += JOINER + this.#globalScanData.creatorNotes;
}
if (this.#injectBuffer.length > 0) {