rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

WI2AN: Fix formatting

Browse Source 
Signed-off-by: kingbri <bdashore3@proton.me>
This commit is contained in:
kingbri
2023-06-20 11:30:29 -04:00
parent 5fa5edffba
commit 350e2108e2
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/script.js
View File

@@ -2022,11 +2022,12 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
} }
// Extension added strings // Extension added strings
//set non-WI AN
// Set non-WI AN
setFloatingPrompt(); setFloatingPrompt();
//add WI to prompt (and also inject WI to AN value via hijack) // Add WI to prompt (and also inject WI to AN value via hijack)
let { worldInfoString, worldInfoBefore, worldInfoAfter } = await getWorldInfoPrompt(chat2); let { worldInfoString, worldInfoBefore, worldInfoAfter } = await getWorldInfoPrompt(chat2);
// call combined AN into Generate // Call combined AN into Generate
let allAnchors = getAllExtensionPrompts(); let allAnchors = getAllExtensionPrompts();
const afterScenarioAnchor = getExtensionPrompt(extension_prompt_types.AFTER_SCENARIO); const afterScenarioAnchor = getExtensionPrompt(extension_prompt_types.AFTER_SCENARIO);
let zeroDepthAnchor = getExtensionPrompt(extension_prompt_types.IN_CHAT, 0, ' '); let zeroDepthAnchor = getExtensionPrompt(extension_prompt_types.IN_CHAT, 0, ' ');

2
public/scripts/extensions/floating-prompt/index.js
View File

@@ -199,7 +199,6 @@ function loadSettings() {
export function setFloatingPrompt() { export function setFloatingPrompt() {
const context = getContext(); const context = getContext();
console.log(context.characterId, context.groupId)
if (!context.groupId && context.characterId === undefined) { if (!context.groupId && context.characterId === undefined) {
return; return;
} }
@@ -230,7 +229,6 @@ export function setFloatingPrompt() {
: (chat_metadata[metadata_keys.interval] - lastMessageNumber); : (chat_metadata[metadata_keys.interval] - lastMessageNumber);
const shouldAddPrompt = messagesTillInsertion == 0; const shouldAddPrompt = messagesTillInsertion == 0;
shouldWIAddPrompt = shouldAddPrompt; shouldWIAddPrompt = shouldAddPrompt;
console.debug(shouldAddPrompt, messagesTillInsertion);
let prompt = shouldAddPrompt ? $('#extension_floating_prompt').val() : ''; let prompt = shouldAddPrompt ? $('#extension_floating_prompt').val() : '';
if (shouldAddPrompt && extension_settings.note.chara && getContext().characterId) { if (shouldAddPrompt && extension_settings.note.chara && getContext().characterId) {