Merge branch 'release' into staging

908368f2217682e02169a234ddbf5a1c6fb9c2ae

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

public/scripts/authors-note.js+18 -1 Viewed

 export { MODULE_NAME as NOTE_MODULE_NAME };
 import { t } from './i18n.js';
 import { macros, MacroCategory } from './macros/macro-system.js';
+import { MacrosParser } from './macros.js';
+import { power_user } from './power-user.js';
 const MODULE_NAME = '2_floating_prompt'; // <= Deliberate, for sorting lower than memory

+}
 function registerAuthorsNoteMacros() {
+    if (power_user.experimental_macro_engine) {
         macros.register('authorsNote', {
             category: MacroCategory.PROMPTS,
             description: t`The contents of the Author's Note`,

             description: t`The contents of the Default Author's Note`,
             handler: () => extension_settings.note.default ?? '',
         });
+    } else {
+        // TODO: Remove this when the experimental macro engine is replacing the old macro engine
+        MacrosParser.registerMacro('authorsNote',
+            () => chat_metadata[metadata_keys.prompt] ?? '',
+            t`The contents of the Author's Note`,
+        );
+        MacrosParser.registerMacro('charAuthorsNote',
+            () => this_chid !== undefined ? (extension_settings.note.chara.find((e) => e.name === getCharaFilename())?.prompt ?? '') : '',
+            t`The contents of the Character Author's Note`,
+        );
+        MacrosParser.registerMacro('defaultAuthorsNote',
+            () => extension_settings.note.default ?? '',
+            t`The contents of the Default Author's Note`,
+        );
+    }
+}