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

Merge branch 'staging' into ru-l10n

Browse Source
This commit is contained in:
Cohee
2024-05-20 21:45:02 +03:00
parent 1eca18f287 454a71922d
commit 0c36d4e67d
15 changed files with 966 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
public/script.js
View File

@ -1547,6 +1547,13 @@ function getCharacterSource(chId = this_chid) {
return sourceUrl;
}
const risuId = characters[chId]?.data?.extensions?.risuai?.source;
if (Array.isArray(risuId) && risuId.length && typeof risuId[0] === 'string' && risuId[0].startsWith('risurealm:')) {
const realmId = risuId[0].split(':')[1];
return `https://realm.risuai.net/character/${realmId}`;
}
return '';
}
@ -5938,7 +5945,7 @@ export function changeMainAPI() {
getStatusHorde();
getHordeModels(true);
}
validateDisabledSamplers()
validateDisabledSamplers();
setupChatCompletionPromptManager(oai_settings);
forceCharacterEditorTokenize();
}
@ -6169,7 +6176,7 @@ export async function getSettings() {
firstRun = false;
}
}
await validateDisabledSamplers()
await validateDisabledSamplers();
settingsReady = true;
eventSource.emit(event_types.SETTINGS_LOADED);
}
@ -10240,19 +10247,8 @@ jQuery(async function () {
if (power_user.zoomed_avatar_magnification) {
$('.zoomed_avatar_container').izoomify();
} else {
$(`.zoomed_avatar[forChar="${charname}"] .dragClose`).hide();
}
$('.zoomed_avatar').on('mouseup', (e) => {
if (e.target.closest('.drag-grabber') || e.button !== 0) {
return;
}
$(`.zoomed_avatar[forChar="${charname}"]`).fadeOut(animation_duration, () => {
$(`.zoomed_avatar[forChar="${charname}"]`).remove();
});
});
$('.zoomed_avatar, .zoomed_avatar .dragClose').on('click touchend', (e) => {
if (e.target.closest('.dragClose')) {
$(`.zoomed_avatar[forChar="${charname}"]`).fadeOut(animation_duration, () => {