rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use uuid extraction from Pygsite URL

This commit is contained in:
Cohee 2024-02-16 20:24:06 +02:00
parent c8b0030f6e
commit 7fbef32869
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,7 +234,7 @@ async function downloadPygmalionCharacter(id) {
if (!result.ok) { if (!result.ok) {
const text = await result.text(); const text = await result.text();
console.log('Pygsite returned error', result.statusText, text); console.log('Pygsite returned error', result.status, text);
throw new Error('Failed to download character'); throw new Error('Failed to download character');
} }
@ -264,7 +264,7 @@ async function downloadPygmalionCharacter(id) {
fileName: `${sanitize(id)}.png`, fileName: `${sanitize(id)}.png`,
fileType: 'image/png', fileType: 'image/png',
}; };
} catch(e) { } catch (e) {
console.error('Failed to download avatar, using JSON instead', e); console.error('Failed to download avatar, using JSON instead', e);
return { return {
buffer: Buffer.from(JSON.stringify(jsonData)), buffer: Buffer.from(JSON.stringify(jsonData)),
@ -349,7 +349,7 @@ async function downloadJannyCharacter(uuid) {
* @param {String} url * @param {String} url
* @returns {String | null } UUID of the character * @returns {String | null } UUID of the character
*/ */
function parseJannyUrl(url) { function getUuidFromUrl(url) {
// Extract UUID from URL // Extract UUID from URL
const uuidRegex = /[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}/; const uuidRegex = /[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}/;
const matches = url.match(uuidRegex); const matches = url.match(uuidRegex);
@ -375,7 +375,7 @@ router.post('/import', jsonParser, async (request, response) => {
const isPygmalionContent = url.includes('pygmalion.chat'); const isPygmalionContent = url.includes('pygmalion.chat');
if (isPygmalionContent) { if (isPygmalionContent) {
const uuid = url.split('/').pop(); const uuid = getUuidFromUrl(url);
if (!uuid) { if (!uuid) {
return response.sendStatus(404); return response.sendStatus(404);
} }
@ -383,7 +383,7 @@ router.post('/import', jsonParser, async (request, response) => {
type = 'character'; type = 'character';
result = await downloadPygmalionCharacter(uuid); result = await downloadPygmalionCharacter(uuid);
} else if (isJannnyContent) { } else if (isJannnyContent) {
const uuid = parseJannyUrl(url); const uuid = getUuidFromUrl(url);
if (!uuid) { if (!uuid) {
return response.sendStatus(404); return response.sendStatus(404);
} }