This commit is contained in:
RossAscends
2023-06-22 22:21:21 +09:00
parent 4230f3881d
commit 40e2af4c73
3 changed files with 31 additions and 1 deletions

View File

@ -2205,6 +2205,10 @@
<input id="allow_name1_display" type="checkbox" /> <input id="allow_name1_display" type="checkbox" />
<span data-i18n="Allow {{user}}: in bot messages">Show {{user}}: in responses</span> <span data-i18n="Allow {{user}}: in bot messages">Show {{user}}: in responses</span>
</label> </label>
<!-- <label class="checkbox_label" for="removeXML">
<input id="removeXML" type="checkbox" />
<span data-i18n="Remove XML/HTML tags from responses">Remove &lt;tags&gt; from responses</span>
</label> -->
<label for="console_log_prompts"> <label for="console_log_prompts">
<input id="console_log_prompts" type="checkbox" /> <input id="console_log_prompts" type="checkbox" />
Log prompts to console Log prompts to console
@ -3355,4 +3359,4 @@
</script> </script>
</body> </body>
</html> </html>

View File

@ -1084,6 +1084,17 @@ function messageFormatting(mes, ch_name, isSystem, isUser) {
mes = mes.replaceAll(`${ch_name}:`, ""); mes = mes.replaceAll(`${ch_name}:`, "");
} }
//function to hide any <tags> from AI response output
/* if (power_user.removeXML && ch_name && !isUser && !isSystem) {
//console.log('incoming mes')
//console.log(mes)
mes = mes.replaceAll(/&lt;/g, "<");
mes = mes.replaceAll(/&gt;/g, ">");
mes = mes.replaceAll(/<<[^>>]+>>/g, "");
//console.log('mes after removed <tags>')
//console.log(mes)
} */
return mes; return mes;
} }
@ -2796,6 +2807,11 @@ function getMultigenAmount() {
} }
async function DupeChar() { async function DupeChar() {
if (!this_chid) {
toastr.warning('You must first select a character to duplicate!')
return;
}
const body = { avatar_url: characters[this_chid].avatar }; const body = { avatar_url: characters[this_chid].avatar };
const response = await fetch('/dupecharacter', { const response = await fetch('/dupecharacter', {
method: 'POST', method: 'POST',
@ -5987,6 +6003,8 @@ if (isPwaMode) { $("body").addClass('PWA') }
$(document).ready(function () { $(document).ready(function () {
//////////INPUT BAR FOCUS-KEEPING LOGIC///////////// //////////INPUT BAR FOCUS-KEEPING LOGIC/////////////
registerSlashCommand('dupe', DupeChar, [], " duplicates the currently selected character", true, true);
setTimeout(function () { setTimeout(function () {
$("#groupControlsToggle").trigger('click'); $("#groupControlsToggle").trigger('click');
$("#groupCurrentMemberListToggle .inline-drawer-icon").trigger('click'); $("#groupCurrentMemberListToggle .inline-drawer-icon").trigger('click');

View File

@ -132,6 +132,7 @@ let power_user = {
render_formulas: false, render_formulas: false,
allow_name1_display: false, allow_name1_display: false,
allow_name2_display: false, allow_name2_display: false,
//removeXML: false,
hotswap_enabled: true, hotswap_enabled: true,
timer_enabled: true, timer_enabled: true,
timestamps_enabled: true, timestamps_enabled: true,
@ -573,6 +574,7 @@ function loadPowerUserSettings(settings, data) {
$("#auto_save_msg_edits").prop("checked", power_user.auto_save_msg_edits); $("#auto_save_msg_edits").prop("checked", power_user.auto_save_msg_edits);
$("#allow_name1_display").prop("checked", power_user.allow_name1_display); $("#allow_name1_display").prop("checked", power_user.allow_name1_display);
$("#allow_name2_display").prop("checked", power_user.allow_name2_display); $("#allow_name2_display").prop("checked", power_user.allow_name2_display);
//$("#removeXML").prop("checked", power_user.removeXML);
$("#hotswapEnabled").prop("checked", power_user.hotswap_enabled); $("#hotswapEnabled").prop("checked", power_user.hotswap_enabled);
$("#messageTimerEnabled").prop("checked", power_user.timer_enabled); $("#messageTimerEnabled").prop("checked", power_user.timer_enabled);
$("#messageTimestampsEnabled").prop("checked", power_user.timestamps_enabled); $("#messageTimestampsEnabled").prop("checked", power_user.timestamps_enabled);
@ -1268,6 +1270,12 @@ $(document).ready(() => {
saveSettingsDebounced(); saveSettingsDebounced();
}); });
/* $("#removeXML").on("input", function () {
power_user.removeXML = !!$(this).prop('checked');
reloadCurrentChat();
saveSettingsDebounced();
}); */
$("#token_padding").on("input", function () { $("#token_padding").on("input", function () {
power_user.token_padding = Number($(this).val()); power_user.token_padding = Number($(this).val());
saveSettingsDebounced(); saveSettingsDebounced();