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 the check for V1 vs V2, cleanup

Browse Source
This commit is contained in:
BlipRanger
2023-06-28 00:57:20 -04:00
parent 762684ffea
commit 136ba40956
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/script.js
View File

@@ -6312,8 +6312,6 @@ function importCharacter(file) {
if (this_chid != undefined && this_chid != "invalid-safety-id") { if (this_chid != undefined && this_chid != "invalid-safety-id") {
oldSelectedChar = characters[this_chid].avatar; oldSelectedChar = characters[this_chid].avatar;
} }
console.log("importing tags");
console.log(data);
await getCharacters(); await getCharacters();
select_rm_info(`char_import`, data.file_name, oldSelectedChar); select_rm_info(`char_import`, data.file_name, oldSelectedChar);

2
server.js
View File

@@ -809,7 +809,7 @@ function readFromV2(char) {
return; return;
} }
} }
if (!_.isUndefined(char[charField]) && !_.isUndefined(v2Value) && char[charField] !== v2Value) { if (!_.isUndefined(char[charField]) && !_.isUndefined(v2Value) && String(char[charField]) !== String(v2Value)) {
console.debug(`Spec v2 data mismatch with Spec v1 for field: ${charField}`, char[charField], v2Value); console.debug(`Spec v2 data mismatch with Spec v1 for field: ${charField}`, char[charField], v2Value);
} }
char[charField] = v2Value; char[charField] = v2Value;