From 2389cd91b414effc3196652d567ee2aa66d76253 Mon Sep 17 00:00:00 2001
From: SillyLossy <titan0599@gmail.com>
Date: Sun, 12 Feb 2023 13:47:36 +0200
Subject: [PATCH 1/2] Fix settings resetting. Hide secondary key unless
 selective

---
 public/index.html | 45 ++++++++++++++++++++++++---------------------
 server.js         |  2 +-
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/public/index.html b/public/index.html
index e5d7c6c46..3975f4669 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2333,26 +2333,6 @@
                             koboldai_setting_names = {};
                             koboldai_setting_names = arr_holder;
 
-                            // world info settings
-                            koboldai_world_names = data.koboldai_world_names?.length ? data.koboldai_world_names : [];
-
-                            if(settings.kobold_world != undefined) {
-                                if (koboldai_world_names.includes(settings.kobold_world)) {
-                                    kobold_world = settings.kobold_world;
-                                    kobold_world_synced = false;
-                                    kobold_sync_failed = false;
-                                }
-                            }
-
-                            koboldai_world_names.forEach((item, i) => {
-                                $('#world_info').append(`<option value='${i}'>${item}</option>`);
-                                // preselect world if saved
-                                if (item == kobold_world){
-                                    $('#world_info').val(i).change();
-                                }
-                            });
-                            // end world info settings
-
                             preset_settings = settings.preset_settings;
 
                             temp = settings.temp;
@@ -2440,6 +2420,26 @@
 
                             api_server = settings.api_server;
                             $('#api_url_text').val(api_server);
+
+                            // world info settings
+                            koboldai_world_names = data.koboldai_world_names?.length ? data.koboldai_world_names : [];
+
+                            if(settings.kobold_world != undefined) {
+                                if (koboldai_world_names.includes(settings.kobold_world)) {
+                                    kobold_world = settings.kobold_world;
+                                    kobold_world_synced = false;
+                                    kobold_sync_failed = false;
+                                }
+                            }
+
+                            koboldai_world_names.forEach((item, i) => {
+                                $('#world_info').append(`<option value='${i}'>${item}</option>`);
+                                // preselect world if saved
+                                if (item == kobold_world) {
+                                    $('#world_info').val(i).change();
+                                }
+                            });
+                            // end world info settings
                         }
                         if(!is_checked_colab) isColab();
                         
@@ -3086,6 +3086,9 @@
                     const value = $(this).prop('checked');
                     kobold_world_data.entries[uid].selective = value;
                     saveWorldInfo();
+
+                    const keysecondary = $(this).closest('.world_entry').find('.keysecondary');
+                    value ? keysecondary.show() : keysecondary.hide();
                 });
                 selectiveInput.prop('checked', entry.selective).trigger('input');
                 selectiveInput.siblings('.checkbox_fancy').click(function() {
@@ -3378,7 +3381,7 @@
                         </label>
                         <input class="text_pole" type="text" name="key" placeholder=""/>
                     </div>
-                    <div class="world_entry_form_control">
+                    <div class="world_entry_form_control keysecondary">
                         <label for="keysecondary">
                             <h4>Secondary Key</h4>
                             <h5>Comma-separated list of additional keywords (e.g: foo,bar).</h5>
diff --git a/server.js b/server.js
index 0776bbb76..fb543dccb 100644
--- a/server.js
+++ b/server.js
@@ -1377,7 +1377,7 @@ function isEntryOutOfSync(tavernEntry, koboldEntry) {
         tavernEntry.selective !== koboldEntry.selective ||
         tavernEntry.constant !== koboldEntry.constant ||
         tavernEntry.key.join(',') !== koboldEntry.key ||
-        tavernEntry.keysecondary.join(',') !== koboldEntry.keysecondary;
+        (koboldEntry.selective ? tavernEntry.keysecondary.join(',') !== koboldEntry.keysecondary : false);
 }
 
 // ** REST CLIENT ASYNC WRAPPERS **

From 87428fba7894c49761c42eefbb8e31bd6008af96 Mon Sep 17 00:00:00 2001
From: SillyLossy <titan0599@gmail.com>
Date: Sun, 12 Feb 2023 14:31:01 +0200
Subject: [PATCH 2/2] Add world creation button

---
 public/index.html | 40 ++++++++++++++++++++++++++++++++++++++++
 public/style.css  |  4 ++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/public/index.html b/public/index.html
index 3975f4669..7b9021505 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3257,6 +3257,41 @@
                 return null;
             }
 
+            function getFreeWorldName() {
+                const MAX_FREE_NAME = 100_000;
+                for (let index = 1; index < MAX_FREE_NAME; index++) {
+                    const newName = `New World (${index})`;
+                    if (koboldai_world_names.includes(newName)) {
+                        continue;
+                    }
+                    return newName;
+                }
+
+                return undefined;
+            }
+
+            async function createNewWorldInfo() {
+                const worldInfoTemplate = { folders: {}, entries: {} };
+                const worldInfoName = getFreeWorldName();
+
+                if (!worldInfoName) {
+                    return;
+                }
+
+                kobold_world = worldInfoName;
+                kobold_world_data = { ...worldInfoTemplate };
+                await saveWorldInfo(true);
+                await updateWorldInfoList();
+
+                const selectedIndex = koboldai_world_names.indexOf(worldInfoName);
+                if (selectedIndex !== -1) {
+                    $('#world_info').val(selectedIndex).change();
+                }
+                else {
+                    $('#world_info').val('None').change();
+                }
+            }
+
             $('#world_info_edit_button').click(() => {
                 is_world_edit_open ? hideWorldEditor() : showWorldEditor();
             });
@@ -3285,6 +3320,10 @@
             $('#world_popup_name_button').click(() => {
                 renameWorldInfo();
             });
+
+            $('#world_create_button').click(() => {
+                createNewWorldInfo();
+            });
         });
     </script>
 <title>Tavern.AI</title>
@@ -3584,6 +3623,7 @@
                 <div>
                 <h4 id="world_info_block">
                     <span>World Info</span>
+                    <div id="world_create_button" class="right_menu_button"><h2>+Create</h2></div>
                     <div id="world_import_button" class="right_menu_button"><h2>+Import</h2></div>
                 </h4>
                     <h5>How to use (<a href="/notes/13" target="_blank">?</a>)</h5>
diff --git a/public/style.css b/public/style.css
index 0d16b4257..e9d8f33db 100644
--- a/public/style.css
+++ b/public/style.css
@@ -983,14 +983,14 @@ input[type=button] {
     display: inline-block;
 }
 
-#world_import_button {
+#world_import_button, #world_create_button {
     cursor: pointer;
     display: inline-block;
     padding: 0;
     margin: 0;
 }
 
-#world_import_button h2 {
+#world_import_button h2, #world_create_button h2 {
     margin-top: auto;
     margin-bottom: auto;
     margin-left: 1rem;