Merge pull request #2823 from SillyTavern/fix-sendas-forced-avatar Fix `/sendas` to not always enforce avatar, if not needed in solo chats

c4cc33cad97242e48b9a7744b06e229744181896

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

Signed

public/scripts/slash-commands.js+8 -1 Viewed

     main_api,
     name1,
     name2,
+    neutralCharacterName,
     reloadCurrentChat,
     removeMacros,
     renameCharacter,

     const character = characters.find(x => x.avatar === name) ?? characters.find(x => x.name === name);
     let force_avatar, original_avatar;
-    if (character && character.avatar !== 'none') {
+    const chatCharacter = this_chid !== undefined ? characters[this_chid] : null;
+    const isNeutralCharacter = !chatCharacter && name2 === neutralCharacterName && name === neutralCharacterName;
+    if (chatCharacter === character || isNeutralCharacter) {
+        // If the targeted character is the currently selected one in a solo chat, we don't need to force any avatars
+    }
+    else if (character && character.avatar !== 'none') {
         force_avatar = getThumbnailUrl('avatar', character.avatar);
         original_avatar = character.avatar;
+    }