From 8f3da37c6160d8d16ae9c6096df9fcc43acae370 Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Wed, 26 Apr 2023 22:47:43 +0900 Subject: [PATCH 1/2] imported char's first chats get proper names --- server.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server.js b/server.js index 1afe69866..223cb179c 100644 --- a/server.js +++ b/server.js @@ -1471,14 +1471,14 @@ app.post("/importcharacter", urlencodedParser, async function (request, response jsonData.name = sanitize(jsonData.name); png_name = getPngName(jsonData.name); - let char = { "name": jsonData.name, "description": jsonData.description ?? '', "personality": jsonData.personality ?? '', "first_mes": jsonData.first_mes ?? '', "avatar": 'none', "chat": humanizedISO8601DateTime(), "mes_example": jsonData.mes_example ?? '', "scenario": jsonData.scenario ?? '', "create_date": humanizedISO8601DateTime(), "talkativeness": jsonData.talkativeness ?? 0.5 }; + let char = { "name": jsonData.name, "description": jsonData.description ?? '', "personality": jsonData.personality ?? '', "first_mes": jsonData.first_mes ?? '', "avatar": 'none', "chat": jsonData.name + " - " + humanizedISO8601DateTime(), "mes_example": jsonData.mes_example ?? '', "scenario": jsonData.scenario ?? '', "create_date": humanizedISO8601DateTime(), "talkativeness": jsonData.talkativeness ?? 0.5 }; char = JSON.stringify(char); charaWrite('./public/img/ai4.png', char, png_name, response, { file_name: png_name }); } else if (jsonData.char_name !== undefined) {//json Pygmalion notepad jsonData.char_name = sanitize(jsonData.char_name); png_name = getPngName(jsonData.char_name); - let char = { "name": jsonData.char_name, "description": jsonData.char_persona ?? '', "personality": '', "first_mes": jsonData.char_greeting ?? '', "avatar": 'none', "chat": humanizedISO8601DateTime(), "mes_example": jsonData.example_dialogue ?? '', "scenario": jsonData.world_scenario ?? '', "create_date": humanizedISO8601DateTime(), "talkativeness": jsonData.talkativeness ?? 0.5 }; + let char = { "name": jsonData.char_name, "description": jsonData.char_persona ?? '', "personality": '', "first_mes": jsonData.char_greeting ?? '', "avatar": 'none', "chat": jsonData.name + " - " + humanizedISO8601DateTime(), "mes_example": jsonData.example_dialogue ?? '', "scenario": jsonData.world_scenario ?? '', "create_date": humanizedISO8601DateTime(), "talkativeness": jsonData.talkativeness ?? 0.5 }; char = JSON.stringify(char); charaWrite('./public/img/ai4.png', char, png_name, response, { file_name: png_name }); } else { @@ -1501,7 +1501,7 @@ app.post("/importcharacter", urlencodedParser, async function (request, response png_name = getPngName(jsonData.name); if (jsonData.name !== undefined) { - let char = { "name": jsonData.name, "description": jsonData.description ?? '', "personality": jsonData.personality ?? '', "first_mes": jsonData.first_mes ?? '', "avatar": 'none', "chat": humanizedISO8601DateTime(), "mes_example": jsonData.mes_example ?? '', "scenario": jsonData.scenario ?? '', "create_date": humanizedISO8601DateTime(), "talkativeness": jsonData.talkativeness ?? 0.5 }; + let char = { "name": jsonData.name, "description": jsonData.description ?? '', "personality": jsonData.personality ?? '', "first_mes": jsonData.first_mes ?? '', "avatar": 'none', "chat": jsonData.name + " - " + humanizedISO8601DateTime(), "mes_example": jsonData.mes_example ?? '', "scenario": jsonData.scenario ?? '', "create_date": humanizedISO8601DateTime(), "talkativeness": jsonData.talkativeness ?? 0.5 }; char = JSON.stringify(char); await charaWrite(uploadPath, char, png_name, response, { file_name: png_name }); } From c354f8ee3062e3f81bb3b8235dae17cbb48e747c Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Wed, 26 Apr 2023 23:10:15 +0900 Subject: [PATCH 2/2] fix random bg1 not updating correctly --- public/script.js | 8 ++++---- public/style.css | 2 +- server.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/script.js b/public/script.js index e95f4a769..8421d264c 100644 --- a/public/script.js +++ b/public/script.js @@ -1500,9 +1500,9 @@ async function Generate(type, automatic_trigger, force_name2) { } const blockHeading = main_api === 'openai' ? '' : // OpenAI handler always expects it - power_user.custom_chat_separator ? power_user.custom_chat_separator : - power_user.disable_examples_formatting ? '' : - is_pygmalion ? '' : `This is how ${name2} should talk`; + power_user.custom_chat_separator ? power_user.custom_chat_separator : + power_user.disable_examples_formatting ? '' : + is_pygmalion ? '' : `This is how ${name2} should talk`; let mesExamplesArray = mesExamples.split(//gi).slice(1).map(block => `${blockHeading}\n${block.trim()}\n`); if (main_api === 'openai') { @@ -3351,7 +3351,7 @@ function read_bg_load(input) { setBackground(html); $("#bg1").css( "background-image", - `url(${e.target.result})` + `url("${e.target.result}")` ); $("#form_bg_download").after( `
diff --git a/public/style.css b/public/style.css index 843bdc997..b1111687a 100644 --- a/public/style.css +++ b/public/style.css @@ -180,7 +180,7 @@ code { } #bg1 { - background-image: url(backgrounds/tavern1.jpg); + background-image: url('backgrounds/tavern day.jpg'); z-index: -2; } diff --git a/server.js b/server.js index 223cb179c..d60d63408 100644 --- a/server.js +++ b/server.js @@ -959,7 +959,7 @@ app.post("/getuseravatars", jsonParser, function (request, response) { }); app.post("/setbackground", jsonParser, function (request, response) { - var bg = "#bg1 {background-image: url(../backgrounds/" + request.body.bg + ");}"; + var bg = "#bg1 {background-image: url('../backgrounds/" + request.body.bg + "');}"; fs.writeFile('public/css/bg_load.css', bg, 'utf8', function (err) { if (err) { response.send(err);