From a1eb2b794e08fb3732f6fd16158b617f6366dec0 Mon Sep 17 00:00:00 2001
From: Cohee1207 <titan0599@gmail.com>
Date: Wed, 28 Jun 2023 15:48:12 +0300
Subject: [PATCH 1/3] Rearrange Horde blocks

---
 public/index.html       | 8 +++++---
 public/scripts/horde.js | 8 ++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/public/index.html b/public/index.html
index 2ab1e8c86..c3bdb114d 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1308,6 +1308,10 @@
                         <form action="javascript:void(null);" method="post" enctype="multipart/form-data">
                             <div id="kobold_horde_block">
                                 <ul>
+                                    <li>
+                                        Avoid sending sensitive information to the Horde.
+                                        <a target="_blank" href="https://docs.sillytavern.app/usage/api-connections/horde/">Review the Privacy statement</a>
+                                    </li>
                                     <li>
                                         <a target="_blank" href="https://horde.koboldai.net/register">Register a Horde
                                             account for faster queue times</a>
@@ -1347,13 +1351,11 @@
                                 <div class="neutral_warning">For privacy reasons, your API key will be hidden after you
                                     reload the page.</div>
                                 <h4 class="horde_model_title">
-                                    Model
+                                    Models
                                     <div id="horde_refresh" title="Refresh models" class="right_menu_button">
                                         <div class="fa-solid fa-repeat "></div>
                                     </div>
                                 </h4>
-                                <small class="horde_multiple_hint">You can select multiple models.<br>Avoid sending
-                                    sensitive information to the Horde. <a id="horde_privacy_disclaimer" target="_blank" href="https://docs.sillytavern.app/usage/api-connections/horde/">Learn more</a></small>
                                 <select id="horde_model" multiple>
                                     <option>-- Horde models not loaded --</option>
                                 </select>
diff --git a/public/scripts/horde.js b/public/scripts/horde.js
index 51fcd9c4b..061b1c640 100644
--- a/public/scripts/horde.js
+++ b/public/scripts/horde.js
@@ -271,6 +271,14 @@ jQuery(function () {
             placeholder: 'Select Horde models',
             allowClear: true,
             closeOnSelect: false,
+            templateSelection: function(data) {
+                // Customize the pillbox text by shortening the full text
+                return data.id;
+            },
+            templateResult: function(data) {
+                // Return the full text for the dropdown
+                return data.text;
+            },
         });
     }
 })

From f06ca28bbf42459baf23daa0209f76f3a1eb7d63 Mon Sep 17 00:00:00 2001
From: Cohee1207 <titan0599@gmail.com>
Date: Wed, 28 Jun 2023 15:55:53 +0300
Subject: [PATCH 2/3] Reduce console spam on expressions

---
 public/scripts/extensions/expressions/index.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/scripts/extensions/expressions/index.js b/public/scripts/extensions/expressions/index.js
index c7edfe266..a8afcc20a 100644
--- a/public/scripts/extensions/expressions/index.js
+++ b/public/scripts/extensions/expressions/index.js
@@ -533,6 +533,11 @@ function drawSpritesList(character, labels, sprites) {
     $('.expression_settings').show();
     $('#image_list').empty();
     $('#image_list').data('name', character);
+
+    if (!Array.isArray(labels)) {
+        return [];
+    }
+
     labels.sort().forEach((item) => {
         const sprite = sprites.find(x => x.label == item);
 

From 931fffaa5ca2f06e710bca3e3068d94bc290b879 Mon Sep 17 00:00:00 2001
From: Cohee <titan0599@gmail.com>
Date: Wed, 28 Jun 2023 16:16:49 +0300
Subject: [PATCH 3/3] Fix chat.comp models not saving on Safari

---
 public/scripts/openai.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index a1295defc..26d2c69a9 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -990,8 +990,11 @@ function loadOpenAISettings(data, settings) {
 
     $('#stream_toggle').prop('checked', oai_settings.stream_openai);
 
+    $('#model_openai_select').val(oai_settings.openai_model);
     $(`#model_openai_select option[value="${oai_settings.openai_model}"`).attr('selected', true);
+    $('#model_claude_select').val(oai_settings.claude_model);
     $(`#model_claude_select option[value="${oai_settings.claude_model}"`).attr('selected', true);
+    $('#model_windowai_select').val(oai_settings.windowai_model);
     $(`#model_windowai_select option[value="${oai_settings.windowai_model}"`).attr('selected', true);
     $('#openai_max_context').val(oai_settings.openai_max_context);
     $('#openai_max_context_counter').text(`${oai_settings.openai_max_context}`);