Refactor bookmarks with correct async and export

cb9e73decaa808a85306ca59f26b6211a085a254

Wolfsblvt <wolfsblvt@gmail.com>

public/scripts/bookmarks.js+11 -17 Viewed

     this_chid,
     openCharacterChat,
     chat_metadata,
 -    callPopup,
     getRequestHeaders,
     getThumbnailUrl,
     getCharacters,

 import { createTagMapFromList } from './tags.js';
 import {
 -    delay,
     getUniqueName,
 } from './utils.js';
 -export {
 -    createNewBookmark,
 -    showBookmarksButtons,
 -};
+-
 const bookmarkNameToken = 'Checkpoint #';
 async function getExistingChatNames() {

     return null;
+}
 export function showBookmarksButtons() {
     try {
         if (selected_group) {
             $('#option_convert_to_group').hide();

@@ -130,10 +123,10 @@ async function saveBookmarkMenu() {
130	123	return;
131	124	}
132	125
133	126	return await createNewBookmark(chat.length - 1);
134	127	}
135	128
136	129	export async function createBranch(mesId) {
137	130	if (!chat.length) {
138	131	toastr.warning('The chat is empty.', 'Branch creation failed');
139	132	return;

     return name;
+}
 export async function createNewBookmark(mesId) {
     if (this_chid === undefined && !selected_group) {
         toastr.info('No character selected.', 'Checkpoint creation aborted');
         return;

@@ -243,7 +236,7 @@ async function backToMainChat() {
243	236	}
244	237	}
245	238
246	239	export async function convertSoloToGroupChat() {
247	240	if (selected_group) {
248	241	console.log('Already in group. No need for conversion');
249	242	return;

     const activationStrategy = group_activation_strategy.NATURAL;
     const allowSelfResponses = false;
     const favChecked = character.fav || character.fav == 'true';
 +    /** @type {any} */
     const metadata = Object.assign({}, chat_metadata);
     delete metadata.main_chat;

  * @param {number} mesId Message ID
  * @returns {Promise<string>} Branch file name
  */
 export async function branchChat(mesId) {
     if (this_chid === undefined && !selected_group) {
         toastr.info('No character selected.', 'Branch creation aborted');
         return;

         // If shift is held down, we are not following the bookmark, but creating a new one
         if (e.shiftKey) {
             var selectedMesId = $(this).closest('.mes').attr('mesid');
             await createNewBookmark(selectedMesId);
             return;
+        }

@@ -412,7 +406,7 @@ jQuery(function () {
412	406	await openCharacterChat(file_name);
413	407	}
414	408	} finally {
415	409	await hideLoader();
416	410	}
417	411
418	412	$('#shadow_select_chat_popup').css('display', 'none');

     $(document).on('click', '.mes_create_bookmark', async function () {
         var selected_mes_id = $(this).closest('.mes').attr('mesid');
         if (selected_mes_id !== undefined) {
             await createNewBookmark(selected_mes_id);
+        }
     });
     $(document).on('click', '.mes_create_branch', async function () {
         var selected_mes_id = $(this).closest('.mes').attr('mesid');
         if (selected_mes_id !== undefined) {
             await branchChat(Number(selected_mes_id));
+        }
     });
 });