Merge pull request #2863 from SillyTavern/unify-user-avatar Unify default user avatars

dcbaa0787d895b4cbe158c8ae22675cc22b8235c

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

Signed

public/img/user-default.png+0 -0 Viewed

Binary file

public/script.js+1 -0 Viewed

 export const default_avatar = 'img/ai4.png';
 export const system_avatar = 'img/five.png';
 export const comment_avatar = 'img/quill.png';
 +export const default_user_avatar = 'img/user-default.png';
 export let CLIENT_VERSION = 'SillyTavern:UNKNOWN:Cohee#1207'; // For Horde header
 let optionsPopper = Popper.createPopper(document.getElementById('options_button'), document.getElementById('options'), {
     placement: 'top-start',

public/scripts/personas.js+3 -3 Viewed

     characters,
     chat,
     chat_metadata,
     default_avatardefault_user_avatar,
     eventSource,
     event_types,
     getRequestHeaders,

     // Date + name (only ASCII) to make it unique
     const avatarId = `${Date.now()}-${personaName.replace(/[^a-zA-Z0-9]/g, '')}.png`;
     initPersona(avatarId, personaName, '');
     await uploadUserAvatar(default_avatardefault_user_avatar, avatarId);
+}
 /**

@@ -944,7 +944,7 @@ async function onPersonasRestoreInput(e) {
944	944	// If the avatar is missing, upload it
945	945	if (!avatarsList.includes(key)) {
946	946	warnings.push(`Persona image "${key}" (${value}) is missing, uploading default avatar`);
947	947	await uploadUserAvatar(default_avatardefault_user_avatar, key);
948	948	}
949	949	}
950	950

src/constants.js+0 -2 Viewed

     extensions: 'public/scripts/extensions',
 };
 -const DEFAULT_AVATAR = '/img/ai4.png';
 const SETTINGS_FILE = 'settings.json';
 /**

 module.exports = {
     DEFAULT_USER,
 -    DEFAULT_AVATAR,
     SETTINGS_FILE,
     PUBLIC_DIRECTORIES,
     USER_DIRECTORY_TEMPLATE,

src/endpoints/characters.js+1 -2 Viewed

         const char = JSON.stringify(charaFormatData(request.body, request.user.directories));
         const internalName = getPngName(request.body.ch_name, request.user.directories);
         const avatarName = `${internalName}.png`;
 -        const defaultAvatar = './public/img/ai4.png';
         const chatsPath = path.join(request.user.directories.chats, internalName);
         if (!fs.existsSync(chatsPath)) fs.mkdirSync(chatsPath);
         if (!request.file) {
             await writeCharacterData(defaultAvatardefaultAvatarPath, char, internalName, request);
             return response.send(avatarName);
         } else {
             const crop = tryParse(request.query.crop);

src/users.js+5 -4 Viewed

 const mime = require('mime-types');
 const archiver = require('archiver');
 const { USER_DIRECTORY_TEMPLATE, DEFAULT_USER, PUBLIC_DIRECTORIES, DEFAULT_AVATAR, SETTINGS_FILE } = require('./constants');
 const { getConfigValue, color, delay, setConfigValue, generateTimestamp } = require('./util');
 const { readSecret, writeSecret } = require('./endpoints/secrets');

  * @type {Map<string, UserDirectoryList>}
  */
 const DIRECTORIES_CACHE = new Map();
 +const PUBLIC_USER_AVATAR = '/img/default-user.png';
 const STORAGE_KEYS = {
     csrfSecret: 'csrfSecret',

         const settings = fs.existsSync(pathToSettings) ? JSON.parse(fs.readFileSync(pathToSettings, 'utf8')) : {};
         const avatarFile = settings?.power_user?.default_persona || settings?.user_avatar;
         if (!avatarFile) {
             return DEFAULT_AVATARPUBLIC_USER_AVATAR;
+        }
         const avatarPath = path.join(directory.avatars, avatarFile);
         if (!fs.existsSync(avatarPath)) {
             return DEFAULT_AVATARPUBLIC_USER_AVATAR;
+        }
         const mimeType = mime.lookup(avatarPath);
         const base64Content = fs.readFileSync(avatarPath, 'base64');

@@ -490,7 +491,7 @@ async function getUserAvatar(handle) {
490	491	}
491	492	catch {
492	493	// Ignore errors
493	494	return DEFAULT_AVATARPUBLIC_USER_AVATAR;
494	495	}
495	496	}
496	497