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

Move clear function names

Browse Source
This commit is contained in:
Cohee
2024-01-07 21:14:29 +02:00
parent 5bc08ab8c1
commit ad94ba57b1
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
public/scripts/extensions/expressions/index.js
View File

@ -51,6 +51,10 @@ let inApiCall = false;
let lastServerResponseTime = 0; let lastServerResponseTime = 0;
export let lastExpression = {}; export let lastExpression = {};
function isTalkingHeadEnabled() {
return extension_settings.expressions.talkinghead && !extension_settings.expressions.local;
}
function isVisualNovelMode() { function isVisualNovelMode() {
return Boolean(!isMobile() && power_user.waifuMode && getContext().groupId); return Boolean(!isMobile() && power_user.waifuMode && getContext().groupId);
} }
@ -381,7 +385,7 @@ function onExpressionsShowDefaultInput() {
} }
} }
async function unloadLiveChar() { async function unloadTalkingHead() {
if (!modules.includes('talkinghead')) { if (!modules.includes('talkinghead')) {
console.debug('talkinghead module is disabled'); console.debug('talkinghead module is disabled');
return; return;
@ -400,7 +404,7 @@ async function unloadLiveChar() {
} }
} }
async function loadLiveChar() { async function loadTalkingHead() {
if (!modules.includes('talkinghead')) { if (!modules.includes('talkinghead')) {
console.debug('talkinghead module is disabled'); console.debug('talkinghead module is disabled');
return; return;
@ -450,7 +454,7 @@ function handleImageChange() {
return; return;
} }
if (extension_settings.expressions.talkinghead && !extension_settings.expressions.local) { if (isTalkingHeadEnabled()) {
// Method get IP of endpoint // Method get IP of endpoint
const talkingheadResultFeedSrc = `${getApiUrl()}/api/talkinghead/result_feed`; const talkingheadResultFeedSrc = `${getApiUrl()}/api/talkinghead/result_feed`;
$('#expression-holder').css({ display: '' }); $('#expression-holder').css({ display: '' });
@ -613,23 +617,21 @@ async function moduleWorker() {
/** /**
* Checks whether the current character has a talkinghead image available. * Checks whether the current character has a talkinghead image available.
* @returns {Boolean} * @returns {Promise<boolean>} True if the character has a talkinghead image available, false otherwise.
*/ */
async function talkingHeadCheck() { async function isTalkingHeadAvailable() {
let spriteFolderName = getSpriteFolderName(); let spriteFolderName = getSpriteFolderName();
try { try {
await validateImages(spriteFolderName); await validateImages(spriteFolderName);
let talkingheadObj = spriteCache[spriteFolderName].find(obj => obj.label === 'talkinghead'); let talkingheadObj = spriteCache[spriteFolderName].find(obj => obj.label === 'talkinghead');
let talkingheadPath_f = talkingheadObj ? talkingheadObj.path : null; let talkingheadPath = talkingheadObj ? talkingheadObj.path : null;
if (talkingheadPath_f != null) { if (talkingheadPath != null) {
//console.log("talkingheadPath_f " + talkingheadPath_f);
return true; return true;
} else { } else {
//console.log("talkingheadPath_f is null"); await unloadTalkingHead();
unloadLiveChar();
return false; return false;
} }
} catch (err) { } catch (err) {
@ -651,22 +653,22 @@ function getSpriteFolderName(characterMessage = null, characterName = null) {
return spriteFolderName; return spriteFolderName;
} }
function setTalkingHeadState(switch_var) { function setTalkingHeadState(newState) {
extension_settings.expressions.talkinghead = switch_var; // Store setting extension_settings.expressions.talkinghead = newState; // Store setting
saveSettingsDebounced(); saveSettingsDebounced();
if (extension_settings.expressions.local) { if (extension_settings.expressions.local) {
return; return;
} }
talkingHeadCheck().then(result => { isTalkingHeadAvailable().then(result => {
if (result) { if (result) {
//console.log("talkinghead exists!"); //console.log("talkinghead exists!");
if (extension_settings.expressions.talkinghead) { if (extension_settings.expressions.talkinghead) {
loadLiveChar(); loadTalkingHead();
} else { } else {
unloadLiveChar(); unloadTalkingHead();
} }
handleImageChange(); // Change image as needed handleImageChange(); // Change image as needed
@ -740,8 +742,8 @@ async function setSpriteSlashCommand(_, spriteId) {
// (emotion names are the same as for sprites, but it only needs "talkinghead.png"). // (emotion names are the same as for sprites, but it only needs "talkinghead.png").
const currentLastMessage = getLastCharacterMessage(); const currentLastMessage = getLastCharacterMessage();
const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage.name); const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage.name);
let label = ''; let label = spriteId;
if (extension_settings.expressions.local || !extension_settings.expressions.talkinghead) { if (!isTalkingHeadEnabled()) {
await validateImages(spriteFolderName); await validateImages(spriteFolderName);
// Fuzzy search for sprite // Fuzzy search for sprite
@ -756,9 +758,6 @@ async function setSpriteSlashCommand(_, spriteId) {
label = spriteItem.label; label = spriteItem.label;
} }
else {
label = spriteId;
}
const vnMode = isVisualNovelMode(); const vnMode = isVisualNovelMode();
await sendExpressionCall(spriteFolderName, label, true, vnMode); await sendExpressionCall(spriteFolderName, label, true, vnMode);
@ -1126,7 +1125,7 @@ async function setExpression(character, expression, force) {
// Set the talkinghead emotion to the specified expression // Set the talkinghead emotion to the specified expression
// TODO: For now, talkinghead emote only supported when VN mode is off; see also updateVisualNovelMode. // TODO: For now, talkinghead emote only supported when VN mode is off; see also updateVisualNovelMode.
try { try {
let result = await talkingHeadCheck(); let result = await isTalkingHeadAvailable();
if (result) { if (result) {
const url = new URL(getApiUrl()); const url = new URL(getApiUrl());
url.pathname = '/api/talkinghead/set_emotion'; url.pathname = '/api/talkinghead/set_emotion';
@ -1277,8 +1276,8 @@ async function onClickExpressionUpload(event) {
e.target.form.reset(); e.target.form.reset();
// In talkinghead mode, when a new talkinghead image is uploaded, refresh the live char. // In talkinghead mode, when a new talkinghead image is uploaded, refresh the live char.
if (extension_settings.expressions.talkinghead && !extension_settings.expressions.local && id === "talkinghead") { if (extension_settings.expressions.talkinghead && !extension_settings.expressions.local && id === 'talkinghead') {
await loadLiveChar(); await loadTalkingHead();
} }
}; };