rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2840 from SillyTavern/wi-preserve-hash 

Calculate entry hash before replacing macros
This commit is contained in:
Cohee 2024-09-13 13:51:31 +03:00 committed by GitHub
parent 7c383e3218 34b2707895
commit 11549ed737
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,6 +108,7 @@ const KNOWN_DECORATORS = ['@@activate', '@@dont_activate'];
* @property {number} [cooldown] The cooldown of the entry
* @property {number} [delay] The delay of the entry
* @property {string[]} [decorators] Array of decorators for the entry
* @property {number} [hash] The hash of the entry
*/
/**
@ -382,12 +383,6 @@ class WorldInfoBuffer {
* Represents a timed effects manager for World Info.
*/
class WorldInfoTimedEffects {
/**
* Cache for entry hashes. Uses weak map to avoid memory leaks.
* @type {WeakMap<WIScanEntry, number>}
*/
#entryHashCache = new WeakMap();
/**
* Array of chat messages.
* @type {string[]}
@ -485,13 +480,7 @@ class WorldInfoTimedEffects {
* @returns {number} String hash
*/
#getEntryHash(entry) {
if (this.#entryHashCache.has(entry)) {
return this.#entryHashCache.get(entry);
}
const hash = getStringHash(JSON.stringify(entry));
this.#entryHashCache.set(entry, hash);
return hash;
return entry.hash;
}
/**
@ -3603,10 +3592,13 @@ export async function getSortedEntries() {
// Chat lore always goes first
entries = [...chatLore.sort(sortFn), ...entries];
// Parse decorators
// Calculate hash and parse decorators. Split maps to preserve old hashes.
entries = entries.map((entry) => {
const [decorators, content] = parseDecorators(entry.content || '');
return { ...entry, decorators, content };
}).map((entry) => {
const hash = getStringHash(JSON.stringify(entry));
return { ...entry, hash };
});
console.debug(`[WI] Found ${entries.length} world lore entries. Sorted by strategy`, Object.entries(world_info_insertion_strategy).find((x) => x[1] === world_info_character_strategy));