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

downloadGenericPng() handle missing file PNG extension, log generic import url, add error message for when generic import site is not whitelisted

Browse Source
This commit is contained in:
Cyberes
2025-04-19 12:22:43 -06:00
parent 586ce36167
commit 1a1464800f
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -540,9 +540,21 @@ async function downloadGenericPng(url) {
if (result.ok) {
const buffer = Buffer.from(await result.arrayBuffer());
const fileName = sanitize(result.url.split('?')[0].split('/').reverse()[0]);
let fileName = sanitize(result.url.split('?')[0].split('/').reverse()[0]);
const contentType = result.headers.get('content-type') || 'image/png'; //yoink it from AICC function lol
// The `importCharacter()` function detects the MIME (content-type) of the file
// using its file extension. The problem is that not all third-party APIs serve
// their cards with a `.png` extension. To support more third-party sites,
// dynamically append the `.png` extension to the filename if it doesn't
// already have a file extension.
if (contentType === 'image/png') {
const ext = fileName.match(/\.(\w+)$/); // Same regex used by `importCharacter()`
if (!ext) {
fileName += '.png';
}
}
return {
buffer: buffer,
fileName: fileName,
@@ -694,10 +706,12 @@ router.post('/importURL', async (request, response) => {
type = 'character';
result = await downloadRisuCharacter(uuid);
} else if (isGeneric) {
console.info('Downloading from generic url.');
console.info('Downloading from generic url:', url);
type = 'character';
result = await downloadGenericPng(url);
} else {
const receivedURL = new URL(url);
console.error(`Received an import for "${receivedURL.host}", but site is not whitelisted. This domain must be added to the config key "whitelistImportDomains" to allow import from this source.`);
return response.sendStatus(404);
}