Use shared constant for default avatar path

b3077c463538fbbc542bb279baced49cc7f27021

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

src/constants.js+1 -0 Viewed

 export const AVATAR_WIDTH = 512;
 export const AVATAR_HEIGHT = 768;
+export const DEFAULT_AVATAR_PATH = './public/img/ai4.png';
 export const OPENROUTER_HEADERS = {
     'HTTP-Referer': 'https://sillytavern.app',

src/endpoints/characters.js+8 -9 Viewed

 import { Jimp, JimpMime } from '../jimp.js';
 import storage from 'node-persist';
-import { AVATAR_WIDTH, AVATAR_HEIGHT } from '../constants.js';
+import { AVATAR_WIDTH, AVATAR_HEIGHT, DEFAULT_AVATAR_PATH } from '../constants.js';
 import { default as validateAvatarUrlMiddleware, getFileNameValidationFunction } from '../middleware/validateFileName.js';
 import { deepMerge, humanizedISO8601DateTime, tryParse, extractFileFromZipBuffer, MemoryLimitedMap, getConfigValue, mutateJsonString } from '../util.js';
 import { TavernCardValidator } from '../validator/TavernCardValidator.js';

 import { importRisuSprites } from './sprites.js';
 import { getUserDirectories } from '../users.js';
 import { getChatInfo } from './chats.js';
-const defaultAvatarPath = './public/img/ai4.png';
 // With 100 MB limit it would take roughly 3000 characters to reach this limit
 const memoryCacheCapacity = getConfigValue('performance.memoryCacheCapacity', '100mb');

@@ -243,7 +242,7 @@ async function writeCharacterData(inputFile, data, outputFile, request, crop = u
243	} catch (error) {	242	} catch (error) {
244	const message = Buffer.isBuffer(inputFile) ? 'Failed to read image buffer.' : `Failed to read image: ${inputFile}.`;	243	const message = Buffer.isBuffer(inputFile) ? 'Failed to read image buffer.' : `Failed to read image: ${inputFile}.`;
245	console.warn(message, 'Using a fallback image.', error);	244	console.warn(message, 'Using a fallback image.', error);
246	return await fs.promises.readFile(defaultAvatarPath);	245	return await fs.promises.readFile(DEFAULT_AVATAR_PATH);
247	}	246	}
248	}	247	}
249		248

         'creator': '',
         'tags': '',
     }, context.request.user.directories);
-    const result = await writeCharacterData(defaultAvatarPath, JSON.stringify(char), fileName, context.request);
+    const result = await writeCharacterData(DEFAULT_AVATAR_PATH, JSON.stringify(char), fileName, context.request);
     return result ? fileName : '';
+}

+    }
     /** @type {string|Buffer} */
-    let avatar = defaultAvatarPath;
+    let avatar = DEFAULT_AVATAR_PATH;
     const assets = _.get(card, 'data.assets');
     if (Array.isArray(assets) && assets.length) {
         for (const asset of assets.filter(x => x.type === 'icon' && typeof x.uri === 'string')) {

         jsonData['create_date'] = humanizedISO8601DateTime();
         const pngName = preservedFileName || getPngName(jsonData.data?.name || jsonData.name, request.user.directories);
         const char = JSON.stringify(jsonData);
-        const result = await writeCharacterData(defaultAvatarPath, char, pngName, request);
+        const result = await writeCharacterData(DEFAULT_AVATAR_PATH, char, pngName, request);
         return result ? pngName : '';
     } else if (jsonData.name !== undefined) {
         console.info('Importing from v1 json');

         };
         char = convertToV2(char, request.user.directories);
         let charJSON = JSON.stringify(char);
-        const result = await writeCharacterData(defaultAvatarPath, charJSON, pngName, request);
+        const result = await writeCharacterData(DEFAULT_AVATAR_PATH, charJSON, pngName, request);
         return result ? pngName : '';
     } else if (jsonData.char_name !== undefined) {//json Pygmalion notepad
         console.info('Importing from gradio json');

         };
         char = convertToV2(char, request.user.directories);
         const charJSON = JSON.stringify(char);
-        const result = await writeCharacterData(defaultAvatarPath, charJSON, pngName, request);
+        const result = await writeCharacterData(DEFAULT_AVATAR_PATH, charJSON, pngName, request);
         return result ? pngName : '';
+    }

         if (!fs.existsSync(chatsPath)) fs.mkdirSync(chatsPath);
         if (!request.file) {
-            await writeCharacterData(defaultAvatarPath, char, internalName, request);
+            await writeCharacterData(DEFAULT_AVATAR_PATH, char, internalName, request);
             return response.send(avatarName);
         } else {
             const crop = tryParse(request.query.crop);

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

 import { getConfigValue, color, setPermissionsSync } from '../util.js';
 import { write } from '../character-card-parser.js';
 import { serverDirectory } from '../server-directory.js';
+import { DEFAULT_AVATAR_PATH } from '../constants.js';
 const contentDirectory = path.join(serverDirectory, 'default/content');
 const scaffoldDirectory = path.join(serverDirectory, 'default/scaffold');

             // Fallback to default avatar
             if (!avatarBuffer) {
-                const defaultAvatarPath = path.join(serverDirectory, 'public', 'img', 'ai4.png');
+                const defaultAvatarPath = path.join(serverDirectory, DEFAULT_AVATAR_PATH);
                 avatarBuffer = fs.readFileSync(defaultAvatarPath);
+            }