Merge branch 'staging' into viewsecrets-rename

public/scripts/extensions/quick-reply/index.js

@@ -636,9 +636,9 @@ function generateQuickReplyElements() {
     $('#quickReplyContainer').empty().append(quickReplyHtml);
 
     for (let i = 1; i <= extension_settings.quickReply.numberOfSlots; i++) {
-        $(`#quickReply${i}Mes`).on('input', function () { onQuickReplyInput(i); });
-        $(`#quickReply${i}Label`).on('input', function () { onQuickReplyLabelInput(i); });
-        $(`#quickReply${i}CtxButton`).on('click', function () { onQuickReplyCtxButtonClick(i); });
+        $(`#quickReply${i}Mes`).on('input', function () { onQuickReplyInput(this.closest('[data-order]').getAttribute('data-order')); });
+        $(`#quickReply${i}Label`).on('input', function () { onQuickReplyLabelInput(this.closest('[data-order]').getAttribute('data-order')); });
+        $(`#quickReply${i}CtxButton`).on('click', function () { onQuickReplyCtxButtonClick(this.closest('[data-order]').getAttribute('data-order')); });
         $(`#quickReplyContainer > [data-order="${i}"]`).attr('data-contextMenu', JSON.stringify(extension_settings.quickReply.quickReplySlots[i - 1]?.contextMenu ?? []));
     }
 
@@ -692,9 +692,11 @@ function saveQROrder() {
     //update html-level order data to match new sort
     let i = 1;
     $('#quickReplyContainer').children().each(function () {
+        const oldOrder = $(this).attr('data-order');
         $(this).attr('data-order', i);
         $(this).find('input').attr('id', `quickReply${i}Label`);
         $(this).find('textarea').attr('id', `quickReply${i}Mes`);
+        $(this).find(`#quickReply${oldOrder}CtxButton`).attr('id', `quickReply${i}CtxButton`);
         i++;
     });
 

public/scripts/world-info.js

@@ -1374,6 +1374,7 @@ const newEntryTemplate = {
     probability: 100,
     useProbability: true,
     depth: DEFAULT_DEPTH,
+    group: '',
 };
 
 function createWorldInfoEntry(name, data, fromSlashCommand = false) {
@@ -1970,6 +1971,7 @@ function convertAgnaiMemoryBook(inputObj) {
             displayIndex: index,
             probability: null,
             useProbability: false,
+            group: '',
         };
     });
 
@@ -1996,6 +1998,7 @@ function convertRisuLorebook(inputObj) {
             displayIndex: index,
             probability: entry.activationPercent ?? null,
             useProbability: entry.activationPercent ?? false,
+            group: '',
         };
     });
 
@@ -2027,6 +2030,7 @@ function convertNovelLorebook(inputObj) {
             displayIndex: index,
             probability: null,
             useProbability: false,
+            group: '',
         };
     });
 
@@ -2060,6 +2064,7 @@ function convertCharacterBook(characterBook) {
             useProbability: entry.extensions?.useProbability ?? false,
             depth: entry.extensions?.depth ?? DEFAULT_DEPTH,
             selectiveLogic: entry.extensions?.selectiveLogic ?? 0,
+            group: entry.extensions?.group ?? '',
         };
     });
 

server.js

@@ -1876,6 +1876,7 @@ function convertWorldInfoToCharacterBook(name, entries) {
                 useProbability: entry.useProbability ?? false,
                 depth: entry.depth ?? 4,
                 selectiveLogic: entry.selectiveLogic ?? 0,
+                group: entry.group ?? '',
             },
         };