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

Fix colons hiding in group chats. Fix jsonl chat imports hanging

Browse Source
This commit is contained in:
SillyLossy
2023-05-01 21:03:16 +03:00
parent 1fe0310de3
commit c4434c3747
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/script.js
View File

@@ -969,13 +969,10 @@ function messageFormating(mes, ch_name, isSystem, forceAvatar) {
}); });
} }
if (forceAvatar) { if (ch_name && (forceAvatar || ch_name !== name1)) {
mes = mes.replaceAll(ch_name + ":", ""); mes = mes.replaceAll(ch_name + ":", "");
} }
if (ch_name !== name1) {
mes = mes.replaceAll(name2 + ":", "");
}
return mes; return mes;
} }
@@ -3135,7 +3132,7 @@ function messageEditAuto(div) {
} }
chat[this_edit_mes_id]["extra"]["bias"] = bias ?? null; chat[this_edit_mes_id]["extra"]["bias"] = bias ?? null;
mesBlock.find(".mes_text").val(''); mesBlock.find(".mes_text").val('');
mesBlock.find(".mes_text").val(messageFormating(text)); mesBlock.find(".mes_text").val(messageFormating(text, this_edit_mes_chname, chat[this_edit_mes_id].is_system, chat[this_edit_mes_id].force_avatar));
saveChatDebounced(); saveChatDebounced();
} }
@@ -4950,7 +4947,7 @@ $(document).ready(function () {
var text = chat[edit_mes_id]["mes"]; var text = chat[edit_mes_id]["mes"];
if (chat[edit_mes_id]["is_user"]) { if (chat[edit_mes_id]["is_user"]) {
this_edit_mes_chname = name1; this_edit_mes_chname = name1;
} else if (chat[edit_mes_id]["forced_avatar"]) { } else if (chat[edit_mes_id]["force_avatar"]) {
this_edit_mes_chname = chat[edit_mes_id]["name"]; this_edit_mes_chname = chat[edit_mes_id]["name"];
} else { } else {
this_edit_mes_chname = name2; this_edit_mes_chname = name2;
@@ -4995,7 +4992,7 @@ $(document).ready(function () {
$(this) $(this)
.closest(".mes_block") .closest(".mes_block")
.find(".mes_text") .find(".mes_text")
.append(messageFormating(text, this_edit_mes_chname)); .append(messageFormating(text, this_edit_mes_chname, chat[this_edit_mes_id].is_system, chat[this_edit_mes_id].force_avatar));
appendImageToMessage(chat[this_edit_mes_id], $(this).closest(".mes")); appendImageToMessage(chat[this_edit_mes_id], $(this).closest(".mes"));
addCopyToCodeBlocks($(this).closest(".mes")); addCopyToCodeBlocks($(this).closest(".mes"));
this_edit_mes_id = undefined; this_edit_mes_id = undefined;

4
server.js
View File

@@ -1618,7 +1618,7 @@ app.post("/importchat", urlencodedParser, function (request, response) {
rl.once('line', (line) => { rl.once('line', (line) => {
let jsonData = json5.parse(line); let jsonData = json5.parse(line);
if (jsonData.user_name !== undefined) { if (jsonData.user_name !== undefined || jsonData.name !== undefined) {
//console.log(humanizedISO8601DateTime()+':/importchat copying chat as '+ch_name+' - '+humanizedISO8601DateTime()+'.jsonl'); //console.log(humanizedISO8601DateTime()+':/importchat copying chat as '+ch_name+' - '+humanizedISO8601DateTime()+'.jsonl');
fs.copyFile('./uploads/' + filedata.filename, chatsPath + avatar_url + '/' + ch_name + ' - ' + humanizedISO8601DateTime() + '.jsonl', (err) => { //added character name and replaced Date.now() with humanizedISO8601DateTime fs.copyFile('./uploads/' + filedata.filename, chatsPath + avatar_url + '/' + ch_name + ' - ' + humanizedISO8601DateTime() + '.jsonl', (err) => { //added character name and replaced Date.now() with humanizedISO8601DateTime
if (err) { if (err) {
@@ -1630,7 +1630,7 @@ app.post("/importchat", urlencodedParser, function (request, response) {
} }
}); });
} else { } else {
//response.send({error:true}); response.send({error:true});
return; return;
} }
rl.close(); rl.close();