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

Reload expressions list on connecting to API

Browse Source
This commit is contained in:
SillyLossy
2023-04-20 21:16:58 +03:00
parent 330a8cd1d6
commit 9360e65606
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,9 +99,10 @@ async function moduleWorker() {
lastCharacter = context.groupId || context.characterId; lastCharacter = context.groupId || context.characterId;
} }
const offlineMode = $('.expression_settings .offline_mode');
if (!modules.includes('classify')) { if (!modules.includes('classify')) {
$('.expression_settings').show(); $('.expression_settings').show();
$('.expression_settings .offline_mode').css('display', 'block'); offlineMode.css('display', 'block');
lastCharacter = context.groupId || context.characterId; lastCharacter = context.groupId || context.characterId;
if (context.groupId) { if (context.groupId) {
@ -111,7 +112,15 @@ async function moduleWorker() {
return; return;
} }
else { else {
$('.expression_settings .offline_mode').css('display', 'none'); // force reload expressions list on connect to API
if (offlineMode.is(':visible')) {
expressionsList = null;
spriteCache = {};
expressionsList = await getExpressionsList();
await validateImages(currentLastMessage.name, true);
}
offlineMode.css('display', 'none');
} }
@ -260,12 +269,10 @@ async function getExpressionsList() {
console.log('getting expressions list'); console.log('getting expressions list');
// get something for offline mode (default images) // get something for offline mode (default images)
if (!modules.includes('classify')) { if (!modules.includes('classify')) {
return DEFAULT_EXPRESSIONS; return DEFAULT_EXPRESSIONS;
} }
if (Array.isArray(expressionsList)) { if (Array.isArray(expressionsList)) {
return expressionsList; return expressionsList;
} }
@ -273,7 +280,6 @@ async function getExpressionsList() {
url.pathname = '/api/classify/labels'; url.pathname = '/api/classify/labels';
try { try {
const apiResult = await fetch(url, { const apiResult = await fetch(url, {
method: 'GET', method: 'GET',
headers: { 'Bypass-Tunnel-Reminder': 'bypass' }, headers: { 'Bypass-Tunnel-Reminder': 'bypass' },
@ -287,7 +293,6 @@ async function getExpressionsList() {
} }
} }
catch (error) { catch (error) {
console.log(error); console.log(error);
return []; return [];
} }
@ -313,7 +318,6 @@ async function setExpression(character, expression, force) {
}); });
} else { } else {
if (extension_settings.expressions.showDefault) { if (extension_settings.expressions.showDefault) {
setDefault(); setDefault();
} }
} }
@ -344,7 +348,6 @@ function onClickExpressionImage() {
(function () { (function () {
function addExpressionImage() { function addExpressionImage() {
const html = ` const html = `
<div id="expression-holder" class="expression-holder" style="display:none;"> <div id="expression-holder" class="expression-holder" style="display:none;">
<div id="expression-holderheader" class="fa-solid fa-grip drag-grabber"></div> <div id="expression-holderheader" class="fa-solid fa-grip drag-grabber"></div>