From 42730bbe928828110faf9de7f2cf9a95373a03b1 Mon Sep 17 00:00:00 2001
From: Wolfsblvt <wolfsblvt@gmail.com>
Date: Wed, 19 Mar 2025 02:17:17 +0100
Subject: [PATCH 1/3] Fix sprite upload on empty expression

- When no sprite was defined before, it falsely tried to derive the filename from the existing filename when "allow multiple" was not enabled. It now correctly just utilizes the expression name, not relying on filename anymore.
---
 public/scripts/extensions/expressions/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/scripts/extensions/expressions/index.js b/public/scripts/extensions/expressions/index.js
index fc1294f87..830aa26fa 100644
--- a/public/scripts/extensions/expressions/index.js
+++ b/public/scripts/extensions/expressions/index.js
@@ -1810,7 +1810,7 @@ async function onClickExpressionUpload(event) {
                 }
             }
         } else {
-            spriteName = withoutExtension(clickedFileName);
+            spriteName = withoutExtension(expression);
         }
 
         if (!spriteName) {

From 3ca6e0e8fc7beda578a314b24ed820fbc915b1d8 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 21 Mar 2025 10:46:27 +0200
Subject: [PATCH 2/3] Update readme.md

---
 .github/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/readme.md b/.github/readme.md
index 808b76bd0..fc8cef288 100644
--- a/.github/readme.md
+++ b/.github/readme.md
@@ -203,7 +203,7 @@ You will need two mandatory directory mappings and a port mapping to allow Silly
 
 ##### Additional Settings
 
-* `SILLYTAVERN_VERSION` - On the right-hand side of this GitHub page, you'll see "Packages". Select the "sillytavern" package and you'll see the image versions. The image tag "latest" will keep you up-to-date with the current release. You can also utilize "staging" that points to the nightly image the respective branch.
+* `SILLYTAVERN_VERSION` - On the right-hand side of this GitHub page, you'll see "Packages". Select the "sillytavern" package and you'll see the image versions. The image tag "latest" will keep you up-to-date with the current release. You can also utilize "staging" that points to the nightly image of the respective branch.
 
 #### Running the container
 

From 74addf1241e7c64f5608211770b2f97c3c0e2b93 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 22 Mar 2025 19:39:23 +0200
Subject: [PATCH 3/3] Fix TogetherAI models list

---
 public/scripts/textgen-models.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/scripts/textgen-models.js b/public/scripts/textgen-models.js
index 7ad2ae20d..fd70ffa6f 100644
--- a/public/scripts/textgen-models.js
+++ b/public/scripts/textgen-models.js
@@ -130,11 +130,11 @@ export async function loadTogetherAIModels(data) {
         return;
     }
 
-    data.sort((a, b) => a.name.localeCompare(b.name));
+    data.sort((a, b) => a.id.localeCompare(b.id));
     togetherModels = data;
 
-    if (!data.find(x => x.name === textgen_settings.togetherai_model)) {
-        textgen_settings.togetherai_model = data[0]?.name || '';
+    if (!data.find(x => x.id === textgen_settings.togetherai_model)) {
+        textgen_settings.togetherai_model = data[0]?.id || '';
     }
 
     $('#model_togetherai_select').empty();
@@ -145,9 +145,9 @@ export async function loadTogetherAIModels(data) {
         }
 
         const option = document.createElement('option');
-        option.value = model.name;
+        option.value = model.id;
         option.text = model.display_name;
-        option.selected = model.name === textgen_settings.togetherai_model;
+        option.selected = model.id === textgen_settings.togetherai_model;
         $('#model_togetherai_select').append(option);
     }
 }
@@ -592,7 +592,7 @@ function onTogetherModelSelect() {
     const modelName = String($('#model_togetherai_select').val());
     textgen_settings.togetherai_model = modelName;
     $('#api_button_textgenerationwebui').trigger('click');
-    const model = togetherModels.find(x => x.name === modelName);
+    const model = togetherModels.find(x => x.id === modelName);
     setGenerationParamsFromPreset({ max_length: model.context_length });
 }
 
@@ -662,7 +662,7 @@ function getMancerModelTemplate(option) {
 }
 
 function getTogetherModelTemplate(option) {
-    const model = togetherModels.find(x => x.name === option?.element?.value);
+    const model = togetherModels.find(x => x.id === option?.element?.value);
 
     if (!option.id || !model) {
         return option.text;
@@ -670,7 +670,7 @@ function getTogetherModelTemplate(option) {
 
     return $((`
         <div class="flex-container flexFlowColumn">
-            <div><strong>${DOMPurify.sanitize(model.name)}</strong> | <span>${model.context_length || '???'} tokens</span></div>
+            <div><strong>${DOMPurify.sanitize(model.id)}</strong> | <span>${model.context_length || '???'} tokens</span></div>
             <div><small>${DOMPurify.sanitize(model.description)}</small></div>
         </div>
     `));