rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cast this_chid to number in personas.js

Browse Source 
Ensure numeric type for character ID comparisons
Explicitly converts this_chid to Number in multiple functions
to prevent type mismatch issues when checking character connections
and persona states
This commit is contained in:
Wolfsblvt
2025-03-28 01:25:13 +01:00
parent 0a85178846
commit 6dc33e9637
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
public/scripts/personas.js
View File

@@ -465,7 +465,7 @@ export function initPersona(avatarId, personaName, personaDescription) {
* @returns {Promise<boolean>} A promise that resolves to true if the character was converted, false otherwise. * @returns {Promise<boolean>} A promise that resolves to true if the character was converted, false otherwise.
*/ */
export async function convertCharacterToPersona(characterId = null) { export async function convertCharacterToPersona(characterId = null) {
if (null === characterId) characterId = this_chid; if (null === characterId) characterId = Number(this_chid);
const avatarUrl = characters[characterId]?.avatar; const avatarUrl = characters[characterId]?.avatar;
if (!avatarUrl) { if (!avatarUrl) {
@@ -1243,7 +1243,7 @@ function getPersonaStates(avatarId) {
/** @type {PersonaConnection[]} */ /** @type {PersonaConnection[]} */
const connections = power_user.persona_descriptions[avatarId]?.connections; const connections = power_user.persona_descriptions[avatarId]?.connections;
const hasCharLock = !!connections?.some(c => const hasCharLock = !!connections?.some(c =>
(!selected_group && c.type === 'character' && c.id === characters[this_chid]?.avatar) (!selected_group && c.type === 'character' && c.id === characters[Number(this_chid)]?.avatar)
|| (selected_group && c.type === 'group' && c.id === selected_group)); || (selected_group && c.type === 'group' && c.id === selected_group));
return { return {
@@ -1481,7 +1481,7 @@ async function loadPersonaForCurrentChat({ doRender = false } = {}) {
* @returns {string[]} - An array of persona keys that are connected to the given character key * @returns {string[]} - An array of persona keys that are connected to the given character key
*/ */
export function getConnectedPersonas(characterKey = undefined) { export function getConnectedPersonas(characterKey = undefined) {
characterKey ??= selected_group || characters[this_chid]?.avatar; characterKey ??= selected_group || characters[Number(this_chid)]?.avatar;
const connectedPersonas = Object.entries(power_user.persona_descriptions) const connectedPersonas = Object.entries(power_user.persona_descriptions)
.filter(([_, desc]) => desc.connections?.some(conn => conn.type === 'character' && conn.id === characterKey)) .filter(([_, desc]) => desc.connections?.some(conn => conn.type === 'character' && conn.id === characterKey))
.map(([key, _]) => key); .map(([key, _]) => key);
@@ -1513,7 +1513,7 @@ export async function showCharConnections() {
console.log(`Unlocking persona ${personaId} from current character ${name2}`); console.log(`Unlocking persona ${personaId} from current character ${name2}`);
power_user.persona_descriptions[personaId].connections = connections.filter(c => { power_user.persona_descriptions[personaId].connections = connections.filter(c => {
if (menu_type == 'group_edit' && c.type == 'group' && c.id == selected_group) return false; if (menu_type == 'group_edit' && c.type == 'group' && c.id == selected_group) return false;
else if (c.type == 'character' && c.id == characters[this_chid]?.avatar) return false; else if (c.type == 'character' && c.id == characters[Number(this_chid)]?.avatar) return false;
return true; return true;
}); });
saveSettingsDebounced(); saveSettingsDebounced();
@@ -1545,8 +1545,8 @@ export async function showCharConnections() {
export function getCurrentConnectionObj() { export function getCurrentConnectionObj() {
if (selected_group) if (selected_group)
return { type: 'group', id: selected_group }; return { type: 'group', id: selected_group };
if (characters[this_chid]?.avatar) if (characters[Number(this_chid)]?.avatar)
return { type: 'character', id: characters[this_chid]?.avatar }; return { type: 'character', id: characters[Number(this_chid)]?.avatar };
return null; return null;
} }
@@ -1664,7 +1664,7 @@ async function syncUserNameToPersona() {
* Only works if only the first message is present, and not in group mode. * Only works if only the first message is present, and not in group mode.
*/ */
export function retriggerFirstMessageOnEmptyChat() { export function retriggerFirstMessageOnEmptyChat() {
if (this_chid >= 0 && !selected_group && chat.length === 1) { if (Number(this_chid) >= 0 && !selected_group && chat.length === 1) {
$('#firstmessage_textarea').trigger('input'); $('#firstmessage_textarea').trigger('input');
} }
} }
@@ -1979,4 +1979,3 @@ export async function initPersonas() {
eventSource.on(event_types.CHAT_CHANGED, loadPersonaForCurrentChat); eventSource.on(event_types.CHAT_CHANGED, loadPersonaForCurrentChat);
switchPersonaGridView(); switchPersonaGridView();
} }