}
+ */
+ async function resolveExpressionsList() {
+ // get something for offline mode (default images)
+ if (!modules.includes('classify') && !extension_settings.expressions.local) {
+ return DEFAULT_EXPRESSIONS;
+ }
- try {
- if (extension_settings.expressions.local) {
- const apiResult = await fetch('/api/extra/classify/labels', {
- method: 'POST',
- headers: getRequestHeaders(),
- });
+ try {
+ if (extension_settings.expressions.local) {
+ const apiResult = await fetch('/api/extra/classify/labels', {
+ method: 'POST',
+ headers: getRequestHeaders(),
+ });
- if (apiResult.ok) {
- const data = await apiResult.json();
- expressionsList = data.labels;
- return expressionsList;
- }
- } else {
- const url = new URL(getApiUrl());
- url.pathname = '/api/classify/labels';
+ if (apiResult.ok) {
+ const data = await apiResult.json();
+ expressionsList = data.labels;
+ return expressionsList;
+ }
+ } else {
+ const url = new URL(getApiUrl());
+ url.pathname = '/api/classify/labels';
- const apiResult = await doExtrasFetch(url, {
- method: 'GET',
- headers: { 'Bypass-Tunnel-Reminder': 'bypass' },
- });
+ const apiResult = await doExtrasFetch(url, {
+ method: 'GET',
+ headers: { 'Bypass-Tunnel-Reminder': 'bypass' },
+ });
- if (apiResult.ok) {
+ if (apiResult.ok) {
- const data = await apiResult.json();
- expressionsList = data.labels;
- return expressionsList;
+ const data = await apiResult.json();
+ expressionsList = data.labels;
+ return expressionsList;
+ }
}
}
+ catch (error) {
+ console.log(error);
+ return [];
+ }
}
- catch (error) {
- console.log(error);
- return [];
- }
+
+ const result = await resolveExpressionsList();
+ result.push(...extension_settings.expressions.custom);
+ return result;
}
async function setExpression(character, expression, force) {
@@ -1101,6 +1136,72 @@ function onClickExpressionImage() {
setSpriteSlashCommand({}, expression);
}
+async function onClickExpressionAddCustom() {
+ let expressionName = await callPopup(renderExtensionTemplate(MODULE_NAME, 'add-custom-expression'), 'input');
+
+ if (!expressionName) {
+ console.debug('No custom expression name provided');
+ return;
+ }
+
+ expressionName = expressionName.trim().toLowerCase();
+
+ // a-z, 0-9, dashes and underscores only
+ if (!/^[a-z0-9-_]+$/.test(expressionName)) {
+ toastr.info('Invalid custom expression name provided');
+ return;
+ }
+
+ // Check if expression name already exists in default expressions
+ if (DEFAULT_EXPRESSIONS.includes(expressionName)) {
+ toastr.info('Expression name already exists');
+ return;
+ }
+
+ // Check if expression name already exists in custom expressions
+ if (extension_settings.expressions.custom.includes(expressionName)) {
+ toastr.info('Custom expression already exists');
+ return;
+ }
+
+ // Add custom expression into settings
+ extension_settings.expressions.custom.push(expressionName);
+ renderCustomExpressions();
+ saveSettingsDebounced();
+
+ // Force refresh sprites list
+ expressionsList = null;
+ spriteCache = {};
+ moduleWorker();
+}
+
+async function onClickExpressionRemoveCustom() {
+ const selectedExpression = $('#expression_custom').val();
+
+ if (!selectedExpression) {
+ console.debug('No custom expression selected');
+ return;
+ }
+
+ const confirmation = await callPopup(renderExtensionTemplate(MODULE_NAME, 'remove-custom-expression', { expression: selectedExpression }), 'confirm');
+
+ if (!confirmation) {
+ console.debug('Custom expression removal cancelled');
+ return;
+ }
+
+ // Remove custom expression from settings
+ const index = extension_settings.expressions.custom.indexOf(selectedExpression);
+ extension_settings.expressions.custom.splice(index, 1);
+ renderCustomExpressions();
+ saveSettingsDebounced();
+
+ // Force refresh sprites list
+ expressionsList = null;
+ spriteCache = {};
+ moduleWorker();
+}
+
async function handleFileUpload(url, formData) {
try {
const data = await jQuery.ajax({
@@ -1359,6 +1460,11 @@ function setExpressionOverrideHtml(forceClear = false) {
setTalkingHeadState(this.checked);
}
});
+
+ renderCustomExpressions();
+
+ $('#expression_custom_add').on('click', onClickExpressionAddCustom);
+ $('#expression_custom_remove').on('click', onClickExpressionRemoveCustom);
}
addExpressionImage();
diff --git a/public/scripts/extensions/expressions/list-item.html b/public/scripts/extensions/expressions/list-item.html
index ecd2d14b8..aaeec5cec 100644
--- a/public/scripts/extensions/expressions/list-item.html
+++ b/public/scripts/extensions/expressions/list-item.html
@@ -7,6 +7,11 @@
- {{item}}
+
+ {{item}}
+ {{#if isCustom}}
+ (custom)
+ {{/if}}
+
diff --git a/public/scripts/extensions/expressions/remove-custom-expression.html b/public/scripts/extensions/expressions/remove-custom-expression.html
new file mode 100644
index 000000000..73841cce3
--- /dev/null
+++ b/public/scripts/extensions/expressions/remove-custom-expression.html
@@ -0,0 +1,7 @@
+
+ Are you sure you want to remove the expression "{{expression}}"?
+
+
+ Uploaded images will not be deleted, but will no longer be used by the extension.
+
+
diff --git a/public/scripts/extensions/expressions/settings.html b/public/scripts/extensions/expressions/settings.html
index f52f415fc..31d395f99 100644
--- a/public/scripts/extensions/expressions/settings.html
+++ b/public/scripts/extensions/expressions/settings.html
@@ -18,6 +18,15 @@
Image Type - talkinghead (extras)
+
+
+
Can be set manually or with an /emote slash command.
+
+
+
Open a chat to see the character expressions.
@@ -25,6 +34,8 @@
You are in offline mode. Click on the image below to set the expression.
+
+ Use a forward slash to specify a subfolder. Example: Bob/formal
diff --git a/public/scripts/extensions/expressions/style.css b/public/scripts/extensions/expressions/style.css
index d29ec2767..27ed3839e 100644
--- a/public/scripts/extensions/expressions/style.css
+++ b/public/scripts/extensions/expressions/style.css
@@ -123,6 +123,8 @@ img.expression.default {
display: flex;
justify-content: center;
align-items: center;
+ flex-direction: column;
+ line-height: 1;
}
.expression_list_buttons {