Custom chat separators + fixes for drawers logic

This commit is contained in:
SillyLossy
2023-03-24 01:35:07 +02:00
parent 339d3c357d
commit a1f16f470b
7 changed files with 68 additions and 9 deletions

View File

@ -287,6 +287,12 @@ $("document").ready(function () {
} else {
console.log('removing pin class from right nav');
$(RightNavPanel).removeClass('pinnedOpen');
if ($(RightNavPanel).hasClass('openDrawer') && $('.openDrawer').length > 1) {
$(RightNavPanel).slideToggle(200, "swing");
$(rightNavDrawerIcon).toggleClass('openIcon closedIcon');
$(RightNavPanel).toggleClass('openDrawer closedDrawer');
}
}
});

View File

@ -48,6 +48,11 @@ async function moduleWorker() {
// take the count of messages
lastMessageNumber = Array.isArray(context.chat) && context.chat.length ? context.chat.filter(m => m.is_user).length : 0;
// special case for new chat
if (Array.isArray(context.chat) && context.chat.length === 1) {
lastMessageNumber = 1;
}
if (lastMessageNumber <= 0 || promptInsertionInterval <= 0) {
$('#extension_floating_counter').text('No');
return;

View File

@ -7,6 +7,7 @@ export {
disable_scenario_formatting,
disable_personality_formatting,
always_force_name2,
custom_chat_separator,
};
let collapse_newlines = false;
@ -16,6 +17,7 @@ let disable_description_formatting = false;
let disable_scenario_formatting = false;
let disable_personality_formatting = false;
let always_force_name2 = false;
let custom_chat_separator = '';
const storage_keys = {
collapse_newlines: "TavernAI_collapse_newlines",
@ -25,6 +27,7 @@ const storage_keys = {
disable_scenario_formatting: "TavernAI_disable_scenario_formatting",
disable_personality_formatting: "TavernAI_disable_personality_formatting",
always_force_name2: "TavernAI_always_force_name2",
custom_chat_separator: "TavernAI_custom_chat_separator",
};
function collapseNewlines(x) {
@ -39,6 +42,7 @@ function loadPowerUserSettings() {
disable_scenario_formatting = localStorage.getItem(storage_keys.disable_scenario_formatting) == "true";
disable_personality_formatting = localStorage.getItem(storage_keys.disable_personality_formatting) == "true";
always_force_name2 = localStorage.getItem(storage_keys.always_force_name2) == "true";
custom_chat_separator = localStorage.getItem(storage_keys.custom_chat_separator);
$("#force-pygmalion-formatting-checkbox").prop("checked", force_pygmalion_formatting);
$("#collapse-newlines-checkbox").prop("checked", collapse_newlines);
@ -47,6 +51,7 @@ function loadPowerUserSettings() {
$("#disable-scenario-formatting-checkbox").prop("checked", disable_scenario_formatting);
$("#disable-personality-formatting-checkbox").prop("checked", disable_personality_formatting);
$("#always-force-name2-checkbox").prop("checked", always_force_name2);
$("#custom_chat_separator").val(custom_chat_separator);
}
$(document).ready(() => {
@ -87,4 +92,9 @@ $(document).ready(() => {
always_force_name2 = !!$(this).prop("checked");
localStorage.setItem(storage_keys.always_force_name2, always_force_name2);
});
$("#custom_chat_separator").on('input', function() {
custom_chat_separator = $(this).val();
localStorage.setItem(storage_keys.custom_chat_separator, custom_chat_separator);
});
});