8a32b72d · permissionBRICK/SillyTavern

public/script.js+17 -13 Viewed

+}
 export async function getChat() {
 -    //console.log('/api/chats/get -- entered for -- ' + characters[this_chid].name);
     try {
         await unshallowCharacter(this_chid);
         const response = await $.ajaxfetch('/api/chats/get', {
             typemethod: 'POST',
 -            url: '/api/chats/get',
 +            headers: getRequestHeaders(),
 -            data: JSON.stringify({
 +            cache: 'no-cache',
 +            body: JSON.stringify({
                 ch_name: characters[this_chid].name,
                 file_name: characters[this_chid].chat,
                 avatar_url: characters[this_chid].avatar,
             }),
 -            dataType: 'json',
 -            contentType: 'application/json',
         });
 -        if (Array.isArray(response) && response.length > 0) {
++
 +        if (!response.ok) {
 +            throw new Error('Chat could not be loaded');
 +        }
++
 +        const data = await response.json();
 +        if (Array.isArray(data) && data.length > 0) {
             /** @type {ChatHeader} */
             const chatHeader = responsedata.shift();
             chat_metadata = chatHeader?.chat_metadata ?? {};
             chat.splice(0, chat.length, ...responsedata);
             chat.forEach(ensureMessageMediaIsArray);
         } else {
             // An empty/corrupted chat file

             chat_metadata.integrity = uuidv4();
+        }
         await getChatResult();
         eventSource.emit('chatLoaded'event_types.CHAT_LOADED, { detail: { id: this_chid, character: characters[this_chid] } });
         // Focus on the textarea if not already focused on a visible text input
 -        setTimeout(function () {
 +        delay(debounce_timeout.short).then(() => {
             if ($(document.activeElement).is('input:visible, textarea:visible')) {
                 return;
+            }
             $('#send_textarea').trigger('click').trigger('focus');
         }, 200);
     } catch (error) {
         await getChatResult();
         console.log(error);

public/scripts/PromptManager.js+1 -1 Viewed

         eventSource.on(event_types.CHATCOMPLETION_MODEL_CHANGED, () => this.renderDebounced());
         // Re-render when the character changes.
         eventSource.on('chatLoaded'event_types.CHAT_LOADED, (event) => {
             this.handleCharacterSelected(event);
             this.saveServiceSettings().then(() => this.renderDebounced());
         });

public/scripts/events.js+2 -0 Viewed

     MORE_MESSAGES_LOADED: 'more_messages_loaded',
     IMPERSONATE_READY: 'impersonate_ready',
     CHAT_CHANGED: 'chat_id_changed',
 +    // TODO: Naming convention is inconsistent with other events
 +    CHAT_LOADED: 'chatLoaded',
     GENERATION_AFTER_COMMANDS: 'GENERATION_AFTER_COMMANDS',
     GENERATION_STARTED: 'generation_started',
     GENERATION_STOPPED: 'generation_stopped',

Replace $.ajax with fetch (#4978)