Merge pull request #3884 from Cyberes/improve-generic-import downloadGenericPng() handle missing file PNG extension

fc892b4514dff95fdcfde952b911f1432240d449

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

src/endpoints/content-manager.js+15 -2 Viewed

         if (result.ok) {
             const buffer = Buffer.from(await result.arrayBuffer());
             constlet 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,

             type = 'character';
             result = await downloadRisuCharacter(uuid);
         } else if (isGeneric) {
             console.info('Downloading from generic url.:', url);
             type = 'character';
             result = await downloadGenericPng(url);
         } else {
 +            console.error(`Received an import for "${getHostFromUrl(url)}", 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);
+        }