From e0df5783f878d9982081c1323aa61da4ca4789c4 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Mon, 29 Apr 2024 13:50:55 +0300
Subject: [PATCH] Allow macros in positive and negative prompts

---
 public/scripts/extensions/stable-diffusion/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/scripts/extensions/stable-diffusion/index.js b/public/scripts/extensions/stable-diffusion/index.js
index 88fdbad40..bc5174e16 100644
--- a/public/scripts/extensions/stable-diffusion/index.js
+++ b/public/scripts/extensions/stable-diffusion/index.js
@@ -2189,11 +2189,11 @@ async function sendGenerationRequest(generationType, prompt, characterName = nul
         ? extension_settings.sd.prompt_prefix
         : combinePrefixes(extension_settings.sd.prompt_prefix, getCharacterPrefix());
 
-    const prefixedPrompt = combinePrefixes(prefix, prompt, '{prompt}');
+    const prefixedPrompt = substituteParams(combinePrefixes(prefix, prompt, '{prompt}'));
 
-    const negativePrompt = noCharPrefix.includes(generationType)
+    const negativePrompt = substituteParams(noCharPrefix.includes(generationType)
         ? extension_settings.sd.negative_prompt
-        : combinePrefixes(extension_settings.sd.negative_prompt, getCharacterNegativePrefix());
+        : combinePrefixes(extension_settings.sd.negative_prompt, getCharacterNegativePrefix()));
 
     let result = { format: '', data: '' };
     const currentChatId = getCurrentChatId();