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

Update module imports

Browse Source
This commit is contained in:
Cohee
2024-10-11 00:41:08 +03:00
parent a0e6030836
commit 0c8ccf1765
5 changed files with 58 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/endpoints/characters.js
View File

@ -16,7 +16,7 @@ import { AVATAR_WIDTH, AVATAR_HEIGHT } from '../constants.js';
import { jsonParser, urlencodedParser } from '../express-common.js';
import { deepMerge, humanizedISO8601DateTime, tryParse, extractFileFromZipBuffer } from '../util.js';
import { TavernCardValidator } from '../validator/TavernCardValidator.js';
import * as characterCardParser from '../character-card-parser.js';
import { parse, write } from '../character-card-parser.js';
import { readWorldInfoFile } from './worldinfo.js';
import { invalidateThumbnail } from './thumbnails.js';
import { importRisuSprites } from './sprites.js';
@ -38,7 +38,7 @@ async function readCharacterData(inputFile, inputFormat = 'png') {
return characterDataCache.get(cacheKey);
}
const result = characterCardParser.parse(inputFile, inputFormat);
const result = parse(inputFile, inputFormat);
characterDataCache.set(cacheKey, result);
return result;
}
@ -77,7 +77,7 @@ async function writeCharacterData(inputFile, data, outputFile, request, crop = u
const inputImage = await getInputImage();
// Get the chunks
const outputImage = characterCardParser.write(inputImage, data);
const outputImage = write(inputImage, data);
const outputImagePath = path.join(request.user.directories.characters, `${outputFile}.png`);
writeFileAtomicSync(outputImagePath, outputImage);

7
src/endpoints/content-manager.js
View File

@ -5,15 +5,16 @@ import { Buffer } from 'node:buffer';
import express from 'express';
import fetch from 'node-fetch';
import sanitize from 'sanitize-filename';
import { sync as writeFileAtomicSync } from 'write-file-atomic';
import { getConfigValue, color } from '../util.js';
import { jsonParser } from '../express-common.js';
import { sync as writeFileAtomicSync } from 'write-file-atomic';
import { write } from '../character-card-parser.js';
const contentDirectory = path.join(process.cwd(), 'default/content');
const scaffoldDirectory = path.join(process.cwd(), 'default/scaffold');
const contentIndexPath = path.join(contentDirectory, 'index.json');
const scaffoldIndexPath = path.join(scaffoldDirectory, 'index.json');
import * as characterCardParser from '../character-card-parser.js';
const WHITELIST_GENERIC_URL_DOWNLOAD_SOURCES = getConfigValue('whitelistImportDomains', []);
@ -397,7 +398,7 @@ async function downloadPygmalionCharacter(id) {
const avatarResult = await fetch(avatarUrl);
const avatarBuffer = await avatarResult.buffer();
const cardBuffer = characterCardParser.write(avatarBuffer, JSON.stringify(characterData));
const cardBuffer = write(avatarBuffer, JSON.stringify(characterData));
return {
buffer: cardBuffer,

5
src/endpoints/users-private.js
View File

@ -8,9 +8,8 @@ import express from 'express';
import { jsonParser } from '../express-common.js';
import { getUserAvatar, toKey, getPasswordHash, getPasswordSalt, createBackupArchive, ensurePublicDirectoriesExist, toAvatarKey } from '../users.js';
import { SETTINGS_FILE } from '../constants.js';
import * as contentManager from './content-manager.js';
import { checkForNewContent, CONTENT_TYPES } from './content-manager.js';
import { color, Cache } from '../util.js';
import { checkForNewContent } from './content-manager.js';
const RESET_CACHE = new Cache(5 * 60 * 1000);
@ -168,7 +167,7 @@ router.post('/reset-settings', jsonParser, async (request, response) => {
const pathToFile = path.join(request.user.directories.root, SETTINGS_FILE);
await fsPromises.rm(pathToFile, { force: true });
await contentManager.checkForNewContent([request.user.directories], [contentManager.CONTENT_TYPES.SETTINGS]);
await checkForNewContent([request.user.directories], [CONTENT_TYPES.SETTINGS]);
return response.sendStatus(204);
} catch (error) {