From 421c924c229df846e74b88b83a2194b814b2c922 Mon Sep 17 00:00:00 2001 From: Cohee <18619528+Cohee1207@users.noreply.github.com> Date: Fri, 25 Apr 2025 21:01:53 +0300 Subject: [PATCH] Do not append empty joiners --- public/scripts/world-info.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/public/scripts/world-info.js b/public/scripts/world-info.js index 719f4e5a6..74fce2aa3 100644 --- a/public/scripts/world-info.js +++ b/public/scripts/world-info.js @@ -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) {