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

Add positions for char A/N

Browse Source
This commit is contained in:
Cohee
2023-06-25 01:40:06 +03:00
parent 4cc3d335a8
commit 66de4a1e09
1 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,12 @@ export const metadata_keys = {
position: 'note_position', position: 'note_position',
} }
const chara_note_position = {
replace: 0,
before: 1,
after: 2,
}
function setNoteTextCommand(_, text) { function setNoteTextCommand(_, text) {
$('#extension_floating_prompt').val(text).trigger('input'); $('#extension_floating_prompt').val(text).trigger('input');
toastr.success("Author's Note text updated"); toastr.success("Author's Note text updated");
@@ -115,6 +121,16 @@ async function onExtensionFloatingPositionInput(e) {
saveMetadataDebounced(); saveMetadataDebounced();
} }
async function onExtensionFloatingCharPositionInput(e) {
const value = e.target.value;
const charaNote = extension_settings.note.chara.find((e) => e.name === getCharaFilename());
if (charaNote) {
charaNote.position = Number(value);
updateSettings();
}
}
function onExtensionFloatingCharaPromptInput() { function onExtensionFloatingCharaPromptInput() {
const tempPrompt = $(this).val(); const tempPrompt = $(this).val();
const avatarName = getCharaFilename(); const avatarName = getCharaFilename();
@@ -147,7 +163,7 @@ function onExtensionFloatingCharaPromptInput() {
if (!extension_settings.note.chara) { if (!extension_settings.note.chara) {
extension_settings.note.chara = [] extension_settings.note.chara = []
} }
Object.assign(tempCharaNote, { useChara: false }) Object.assign(tempCharaNote, { useChara: false, position: chara_note_position.replace })
extension_settings.note.chara.push(tempCharaNote); extension_settings.note.chara.push(tempCharaNote);
} else { } else {
@@ -193,9 +209,11 @@ function loadSettings() {
$('#extension_floating_chara').val(charaNote ? charaNote.prompt : ''); $('#extension_floating_chara').val(charaNote ? charaNote.prompt : '');
$('#extension_use_floating_chara').prop('checked', charaNote ? charaNote.useChara : false); $('#extension_use_floating_chara').prop('checked', charaNote ? charaNote.useChara : false);
$(`input[name="extension_floating_char_position"][value="${charaNote?.position ?? chara_note_position.replace}"]`).prop('checked', true);
} else { } else {
$('#extension_floating_chara').val(''); $('#extension_floating_chara').val('');
$('#extension_use_floating_chara').prop('checked', false); $('#extension_use_floating_chara').prop('checked', false);
$(`input[name="extension_floating_char_position"][value="${chara_note_position.replace}"]`).prop('checked', true);
} }
$('#extension_floating_default').val(extension_settings.note.default); $('#extension_floating_default').val(extension_settings.note.default);
@@ -240,7 +258,17 @@ export function setFloatingPrompt() {
// Only replace with the chara note if the user checked the box // Only replace with the chara note if the user checked the box
if (charaNote && charaNote.useChara) { if (charaNote && charaNote.useChara) {
switch (charaNote.position) {
case chara_note_position.before:
prompt = charaNote.prompt + '\n' + prompt;
break;
case chara_note_position.after:
prompt = prompt + '\n' + charaNote.prompt;
break;
default:
prompt = charaNote.prompt; prompt = charaNote.prompt;
break;
}
} }
} }
context.setExtensionPrompt(MODULE_NAME, prompt, chat_metadata[metadata_keys.position], chat_metadata[metadata_keys.depth]); context.setExtensionPrompt(MODULE_NAME, prompt, chat_metadata[metadata_keys.position], chat_metadata[metadata_keys.depth]);
@@ -373,6 +401,20 @@ setTimeout(function () {
<input id="extension_use_floating_chara" type="checkbox" /> <input id="extension_use_floating_chara" type="checkbox" />
<span data-i18n="Use character author's note">Use character author's note</span> <span data-i18n="Use character author's note">Use character author's note</span>
</label> </label>
<div class="floating_prompt_radio_group">
<label>
<input type="radio" name="extension_floating_char_position" value="0" />
Replace Author's Note
</label>
<label>
<input type="radio" name="extension_floating_char_position" value="1" />
Top of Author's Note
</label>
<label>
<input type="radio" name="extension_floating_char_position" value="2" />
Bottom of Author's Note
</label>
</div>
</div> </div>
</div> </div>
<hr class="sysHR"> <hr class="sysHR">
@@ -408,6 +450,7 @@ setTimeout(function () {
$('#extension_use_floating_chara').on('input', onExtensionFloatingCharaCheckboxChanged); $('#extension_use_floating_chara').on('input', onExtensionFloatingCharaCheckboxChanged);
$('#extension_floating_default').on('input', onExtensionFloatingDefaultInput); $('#extension_floating_default').on('input', onExtensionFloatingDefaultInput);
$('input[name="extension_floating_position"]').on('change', onExtensionFloatingPositionInput); $('input[name="extension_floating_position"]').on('change', onExtensionFloatingPositionInput);
$('input[name="extension_floating_char_position"]').on('change', onExtensionFloatingCharPositionInput);
$('#ANClose').on('click', function () { $('#ANClose').on('click', function () {
$("#floatingPrompt").transition({ $("#floatingPrompt").transition({
opacity: 0, opacity: 0,