rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-02-02 20:36:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix server crash on import. Fix possible undefined warning

Browse Source
This commit is contained in:
Cohee 2023-12-06 01:02:48 +02:00
parent b58f14d1d2
commit 60909cef1f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/endpoints/characters.js
View File

@ -18,6 +18,7 @@ const { TavernCardValidator } = require('../validator/TavernCardValidator');
const characterCardParser = require('../character-card-parser.js'); const characterCardParser = require('../character-card-parser.js');
const { readWorldInfoFile, convertWorldInfoToCharacterBook } = require('../worldinfo'); const { readWorldInfoFile, convertWorldInfoToCharacterBook } = require('../worldinfo');
const { invalidateThumbnail } = require('./thumbnails'); const { invalidateThumbnail } = require('./thumbnails');
const { importRisuSprites } = require('./sprites');
let characters = {}; let characters = {};
@ -498,7 +499,15 @@ router.post('/merge-attributes', jsonParser, async function (request, response)
const avatarPath = path.join(DIRECTORIES.characters, update.avatar); const avatarPath = path.join(DIRECTORIES.characters, update.avatar);
try { try {
let character = JSON.parse(await charaRead(avatarPath)); const pngStringData = await charaRead(avatarPath);
if (!pngStringData) {
console.error('Error: invalid character file.');
response.status(400).send('Error: invalid character file.');
return;
}
let character = JSON.parse(pngStringData);
character = deepMerge(character, update); character = deepMerge(character, update);
const validator = new TavernCardValidator(character); const validator = new TavernCardValidator(character);
@ -695,7 +704,6 @@ router.post('/import', urlencodedParser, async function (request, response) {
let uploadPath = path.join(UPLOADS_PATH, filedata.filename); let uploadPath = path.join(UPLOADS_PATH, filedata.filename);
var format = request.body.file_type; var format = request.body.file_type;
const defaultAvatarPath = './public/img/ai4.png'; const defaultAvatarPath = './public/img/ai4.png';
const { importRisuSprites } = require('./src/endpoints/sprites');
//console.log(format); //console.log(format);
if (filedata) { if (filedata) {
if (format == 'json') { if (format == 'json') {