rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix tags import after merge

Browse Source
This commit is contained in:
Cohee
2023-06-29 12:27:23 +03:00
parent bc7d7ee3ff
commit e9466916da
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/script.js
View File

@ -6336,7 +6336,7 @@ function importCharacter(file) {
await getCharacters(); await getCharacters();
select_rm_info(`char_import`, data.file_name, oldSelectedChar); select_rm_info(`char_import`, data.file_name, oldSelectedChar);
if(power_user.import_card_tags){ if (power_user.import_card_tags) {
let currentContext = getContext(); let currentContext = getContext();
let avatarFileName = `${data.file_name}.png`; let avatarFileName = `${data.file_name}.png`;
let importedCharacter = currentContext.characters.find(character => character.avatar === avatarFileName); let importedCharacter = currentContext.characters.find(character => character.avatar === avatarFileName);

11
public/scripts/tags.js
View File

@ -236,10 +236,10 @@ async function importTags(imported_char) {
let existingTags = await getExistingTags(imported_tags); let existingTags = await getExistingTags(imported_tags);
let newTags = imported_tags.filter(t => !existingTags.includes(t)); let newTags = imported_tags.filter(t => !existingTags.includes(t));
let selected_tags = ""; let selected_tags = "";
if(newTags.length === 0) { if (newTags.length === 0) {
await callPopup(`<h3>Importing Tags</h3><p>${existingTags.length} exisiting tags have been found.</p>`, 'text'); await callPopup(`<h3>Importing Tags</h3><p>${existingTags.length} existing tags have been found.</p>`, 'text');
} else { } else {
selected_tags = await callPopup(`<h3>Importing Tags</h3><p>${existingTags.length} exisiting tags have been found.</p><p>The following ${newTags.length} new tags will be imported.</p>`, 'input', newTags.join(', ')); selected_tags = await callPopup(`<h3>Importing Tags</h3><p>${existingTags.length} existing tags have been found.</p><p>The following ${newTags.length} new tags will be imported.</p>`, 'input', newTags.join(', '));
} }
selected_tags = existingTags.concat(selected_tags.split(', ')); selected_tags = existingTags.concat(selected_tags.split(', '));
selected_tags = selected_tags.filter(t => t !== ""); selected_tags = selected_tags.filter(t => t !== "");
@ -258,8 +258,9 @@ async function importTags(imported_char) {
tag_map[imported_char.avatar].push(tag.id); tag_map[imported_char.avatar].push(tag.id);
}; };
saveSettingsDebounced(); saveSettingsDebounced();
printTags(); await getCharacters();
getCharacters(); printTagFilters(tag_filter_types.character);
printTagFilters(tag_filter_types.group_member);
// need to return false to keep the input clear // need to return false to keep the input clear
return false; return false;