Merge pull request #3827 from SillyTavern/fix/wi-rename-same-name Prevent similarily-ish world info, preset and chat file renames (preventing data loss on on case-insensitive systems)

f302c67b955b479988df1ace5a600ba81bcabfc8

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

Parents: b5f430de6f446df8bb956ea3c443e0ff69526417 c522baf4f7889a8d1324ec7d8443758a66fa161a

public/script.js+10 -0 Viewed

     escapeHtml,
     saveBase64AsFile,
     uuidv4,
+    equalsIgnoreCaseAndAccents,
 } from './scripts/utils.js';
 import { debounce_timeout, IGNORE_SYMBOL } from './scripts/constants.js';

         renamed_file: `${newName.trim()}.jsonl`,
     };
+    if (body.original_file === body.renamed_file) {
+        console.debug('Chat rename cancelled, old and new names are the same');
+        return;
+    }
+    if (equalsIgnoreCaseAndAccents(body.original_file, body.renamed_file)) {
+        toastr.warning(t`Name not accepted, as it is the same as before (ignoring case and accents).`, t`Rename Chat`);
+        return;
+    }
     try {
         showLoader();
         const response = await fetch('/api/chats/rename', {

public/scripts/preset-manager.js+8 -1 Viewed

     textgenerationwebui_presets,
     textgenerationwebui_settings as textgen_settings,
 } from './textgen-settings.js';
-import { download, parseJsonFile, waitUntilCondition } from './utils.js';
+import { download, equalsIgnoreCaseAndAccents, parseJsonFile, waitUntilCondition } from './utils.js';
 import { t } from './i18n.js';
 import { reasoning_templates } from './reasoning.js';

     async renamePreset(newName) {
         const oldName = this.getSelectedPresetName();
+        if (equalsIgnoreCaseAndAccents(oldName, newName)) {
+            throw new Error('New name must be different from old name');
+        }
         try {
             await this.savePreset(newName);
             await this.deletePreset(oldName);

             console.debug(!presetManager.isAdvancedFormatting() ? 'Preset rename cancelled' : 'Template rename cancelled');
             return;
+        }
+        if (equalsIgnoreCaseAndAccents(oldName, newName)) {
+            toastr.warning(t`Name not accepted, as it is the same as before (ignoring case and accents).`, t`Rename Preset`);
+            return;
+        }
         await presetManager.renamePreset(newName);

public/scripts/world-info.js+5 -1 Viewed

 import { Fuse } from '../lib.js';
 import { saveSettings, substituteParams, getRequestHeaders, chat_metadata, this_chid, characters, saveCharacterDebounced, menu_type, eventSource, event_types, getExtensionPromptByName, saveMetadata, getCurrentChatId, extension_prompt_roles } from '../script.js';
-import { download, debounce, initScrollHeight, resetScrollHeight, parseJsonFile, extractDataFromPng, getFileBuffer, getCharaFilename, getSortableDelay, escapeRegex, PAGINATION_TEMPLATE, navigation_option, waitUntilCondition, isTrueBoolean, setValueByPath, flashHighlight, select2ModifyOptions, getSelect2OptionId, dynamicSelect2DataViaAjax, highlightRegex, select2ChoiceClickSubscribe, isFalseBoolean, getSanitizedFilename, checkOverwriteExistingData, getStringHash, parseStringArray, cancelDebounce, findChar, onlyUnique } from './utils.js';
+import { download, debounce, initScrollHeight, resetScrollHeight, parseJsonFile, extractDataFromPng, getFileBuffer, getCharaFilename, getSortableDelay, escapeRegex, PAGINATION_TEMPLATE, navigation_option, waitUntilCondition, isTrueBoolean, setValueByPath, flashHighlight, select2ModifyOptions, getSelect2OptionId, dynamicSelect2DataViaAjax, highlightRegex, select2ChoiceClickSubscribe, isFalseBoolean, getSanitizedFilename, checkOverwriteExistingData, getStringHash, parseStringArray, cancelDebounce, findChar, onlyUnique, equalsIgnoreCaseAndAccents } from './utils.js';
 import { extension_settings, getContext } from './extensions.js';
 import { NOTE_MODULE_NAME, metadata_keys, shouldWIAddPrompt } from './authors-note.js';
 import { isMobile } from './RossAscends-mods.js';

         console.debug('World info rename cancelled');
         return;
+    }
+    if (equalsIgnoreCaseAndAccents(oldName, newName)) {
+        toastr.warning(t`Name not accepted, as it is the same as before (ignoring case and accents).`, t`Rename World Info`);
+        return;
+    }
     const entryPreviouslySelected = selected_world_info.findIndex((e) => e === oldName);