Merge pull request #2840 from SillyTavern/wi-preserve-hash Calculate entry hash before replacing macros

11549ed7373bc708a8f53ebc724561b47171ab2b

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/scripts/world-info.js+6 -14 Viewed

  * @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
  */
 /**

  */
 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[]}
      */

     * @returns {number} String hash
     */
     #getEntryHash(entry) {
 -        if (this.#entryHashCache.has(entry)) {
 +        return entry.hash;
 -            return this.#entryHashCache.get(entry);
 -        }
+-
 -        const hash = getStringHash(JSON.stringify(entry));
 -        this.#entryHashCache.set(entry, hash);
 -        return hash;
+    }
     /**

         // 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));