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

Proper user name on chats import

Browse Source
This commit is contained in:
SillyLossy
2023-05-27 20:30:53 +03:00
parent 387b1e6d4a
commit f1d3f8d3bd
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/script.js
View File

@@ -6541,6 +6541,7 @@ $(document).ready(function () {
$("#chat_import_file_type").val(format); $("#chat_import_file_type").val(format);
var formData = new FormData($("#form_import_chat").get(0)); var formData = new FormData($("#form_import_chat").get(0));
formData.append('user_name', name1);
$("#select_chat_div").html(""); $("#select_chat_div").html("");
$("#load_select_chat_div").css("display", "block"); $("#load_select_chat_div").css("display", "block");

10
server.js
View File

@@ -1673,6 +1673,8 @@ app.post("/importchat", urlencodedParser, function (request, response) {
let filedata = request.file; let filedata = request.file;
let avatar_url = (request.body.avatar_url).replace('.png', ''); let avatar_url = (request.body.avatar_url).replace('.png', '');
let ch_name = request.body.character_name; let ch_name = request.body.character_name;
let user_name = request.body.user_name || 'You';
if (filedata) { if (filedata) {
if (format === 'json') { if (format === 'json') {
fs.readFile(`./uploads/${filedata.filename}`, 'utf8', (err, data) => { fs.readFile(`./uploads/${filedata.filename}`, 'utf8', (err, data) => {
@@ -1689,13 +1691,13 @@ app.post("/importchat", urlencodedParser, function (request, response) {
from(history) { from(history) {
return [ return [
{ {
user_name: 'You', user_name: user_name,
character_name: ch_name, character_name: ch_name,
create_date: humanizedISO8601DateTime(), create_date: humanizedISO8601DateTime(),
}, },
...history.msgs.map( ...history.msgs.map(
(message) => ({ (message) => ({
name: message.src.is_human ? 'You' : ch_name, name: message.src.is_human ? user_name : ch_name,
is_user: message.src.is_human, is_user: message.src.is_human,
is_name: true, is_name: true,
send_date: humanizedISO8601DateTime(), send_date: humanizedISO8601DateTime(),
@@ -1727,7 +1729,7 @@ app.post("/importchat", urlencodedParser, function (request, response) {
} else if (Array.isArray(jsonData.data_visible)) { } else if (Array.isArray(jsonData.data_visible)) {
// oobabooga's format // oobabooga's format
const chat = [{ const chat = [{
user_name: 'You', user_name: user_name,
character_name: ch_name, character_name: ch_name,
create_date: humanizedISO8601DateTime(), create_date: humanizedISO8601DateTime(),
}]; }];
@@ -1735,7 +1737,7 @@ app.post("/importchat", urlencodedParser, function (request, response) {
for (const arr of jsonData.data_visible) { for (const arr of jsonData.data_visible) {
if (arr[0]) { if (arr[0]) {
const userMessage = { const userMessage = {
name: 'You', name: user_name,
is_user: true, is_user: true,
is_name: true, is_name: true,
send_date: humanizedISO8601DateTime(), send_date: humanizedISO8601DateTime(),