8ccbbe8c · permissionBRICK/SillyTavern

public/script.js+1 -1 Viewed

     //had to add this to make the swipe counter work
     //(copied from the onclick functions for swipe buttons..
     //don't know why the array isn't set for non-swipe messsagesmessages in Generate or addOneMessage..)
     if (chat[chat.length - 1]['swipe_id'] === undefined) {              // if there is no swipe-message in the last spot of the chat array
         chat[chat.length - 1]['swipe_id'] = 0;                        // set it to id 0
         chat[chat.length - 1]['swipes'] = [];                         // empty the array

public/scripts/custom-request.js+4 -4 Viewed

                                     instructPreset,
                                 );
                             } else { // e.g. "<|im_start|>assistant: Hello, my name is"
                                 const overridenInstructPresetoverriddenInstructPreset = structuredClone(instructPreset);
                                 overridenInstructPresetoverriddenInstructPreset.output_suffix = '';
                                 overridenInstructPresetoverriddenInstructPreset.wrap = false;
                                 messageContent = formatInstructModeChat(
                                     message.role,
                                     message.content,

@@ -291,7 +291,7 @@ export class TextCompletionService {
291	291	undefined,
292	292	undefined,
293	293	undefined,
294	294	overridenInstructPresetoverriddenInstructPreset,
295	295	);
296	296	}
297	297	}

public/scripts/nai-settings.js+1 -1 Viewed

     };
+}
 // Check if the prefix needs to be overridenoverridden to use instruct mode
 function selectPrefix(selected_prefix, finalPrompt) {
     let useInstruct = false;
     const clio = nai_settings.model_novel.includes('clio');

public/scripts/personas.js+3 -3 Viewed

 /**
  * Sort the given personas
  * @param {string[]} personas - The persona names to sort
  * @returns {string[]} The sorted persona names arrrayarray, same reference as passed in
  */
 function sortPersonas(personas) {
     const option = $('#persona_sort_order').find(':selected');

                 defaultValue: 'chat',
                 enumList: [
                     new SlashCommandEnumValue('chat', 'Lock the persona to the current chat.'),
                     new SlashCommandEnumValue('character', 'Lock this persona to the currently selected character. If the setting is enabled, mutliplemultiple personas can be locked to the same character.'),
                     new SlashCommandEnumValue('default', 'Lock this persona as the default persona for all new chats.'),
                 ],
             }),

                 defaultValue: 'chat',
                 enumList: [
                     new SlashCommandEnumValue('chat', 'Lock the persona to the current chat.'),
                     new SlashCommandEnumValue('character', 'Lock this persona to the currently selected character. If the setting is enabled, mutliplemultiple personas can be locked to the same character.'),
                     new SlashCommandEnumValue('default', 'Lock this persona as the default persona for all new chats.'),
                 ],
             }),

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

         if (defaultButton) defaultButton.classList.add('menu_button_default');
         // Styling differences depending on the popup type
         // General styling for all types first, that might be overridenoverridden for specific types below
         this.mainInput.style.display = 'none';
         this.inputControls.style.display = customInputs ? 'block' : 'none';
         this.closeButton.style.display = 'none';

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

         if (!this.#isParsingReasoning)
             return mesChanged;
         // If we are in manual parsing mode, all currently streaming mes tokens will go theto the reasoning block
         this.reasoning = parseTarget.slice(power_user.reasoning.prefix.length);
         message.mes = '';

public/scripts/stats.js+4 -4 Viewed

  * @param {string} type - The type of the message processing (e.g., 'append', 'continue', 'appendFinal', 'swipe').
  * @param {Object} characters - Object containing character data.
  * @param {string} this_chid - The character id.
  * @param {string} oldMesssageoldMessage - The old message that's being processed.
  */
 async function statMesProcess(line, type, characters, this_chid, oldMesssageoldMessage) {
     if (this_chid === undefined || characters[this_chid] === undefined) {
         return;
+    }

             stat.user_msg_count++;
             stat.user_word_count += countWords(line.mes);
         } else {
             let oldLen = oldMesssageoldMessage.split(' ').length;
             stat.user_word_count += countWords(line.mes) - oldLen;
+        }
     } else {

@@ -305,7 +305,7 @@ async function statMesProcess(line, type, characters, this_chid, oldMesssage) {
305	305	stat.non_user_msg_count++;
306	306	stat.non_user_word_count += countWords(line.mes);
307	307	} else {
308	308	let oldLen = oldMesssageoldMessage.split(' ').length;
309	309	stat.non_user_word_count += countWords(line.mes) - oldLen;
310	310	}
311	311	}

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

 /**
  * @typedef {object} PrintTagListOptions - Optional parameters for printing the tag list.
  * @property {Tag[]|function(): Tag[]} [tags=undefined] - Optional override of tags that should be printed. Those will not be sorted. If no supplied, tags for the relevant character are printed. Can also be a function that returns the tags.
  * @property {Tag|Tag[]} [addTag=undefined] - Optionally provide one or multiple tags that should be manually added to this print. Either to the overridenoverridden tag list or the found tags based on the entity/key. Will respect the tag exists check.
  * @property {object|number|string} [forEntityOrKey=undefined] - Optional override for the chosen entity, otherwise the currently selected is chosen. Can be an entity with id property (character, group, tag), or directly an id or tag key.
  * @property {boolean|string} [empty=true] - Whether the list should be initially empty. If a string string is provided, 'always' will always empty the list, otherwise it'll evaluate to a boolean.
  * @property {boolean} [sort=true] - Whether the tags should be sorted via the sort function, or kept as is.

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

@@ -2316,7 +2316,7 @@ export function deleteWIOriginalDataValue(data, uid) {
2316	2316	/**
2317	2317	* Splits a given input string that contains one or more keywords or regexes, separated by commas.
2318	2318	*
2319	2319	* Each part can be a valid regex following the pattern `/myregex/flags` with optional flags. CommmasCommas inside the regex are allowed, slashes have to be escaped like this: `\/`
2320	2320	* If a regex doesn't stand alone, it is not treated as a regex.
2321	2321	*
2322	2322	* @param {string} input - One or multiple keywords or regexes, separated by commas

src/endpoints/characters.js+2 -2 Viewed

@@ -1048,7 +1048,7 @@ router.post('/edit', validateAvatarUrlMiddleware, async function (request, respo
1048	1048	return response.sendStatus(200);
1049	1049	}
1050	1050	catch {
1051	1051	console.error('An error occuredoccurred, character edit invalidated.');
1052	1052	}
1053	1053	});
1054	1054

         await writeCharacterData(avatarPath, newCharJSON, targetFile, request);
         return response.sendStatus(200);
     } catch (err) {
         console.error('An error occuredoccurred, character edit invalidated.', err);
+    }
 });

Merge pull request #4057 from omahs/patch-2 Fix typos