3fb83e47 · permissionBRICK/SillyTavern

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

     content = content.replace(/{{firstIncludedMessageId}}/gi, () => String(getFirstIncludedMessageId() ?? ''));
     content = content.replace(/{{lastSwipeId}}/gi, () => String(getLastSwipeId() ?? ''));
     content = content.replace(/{{currentSwipeId}}/gi, () => String(getCurrentSwipeId() ?? ''));
     content = content.replace(/{{reverse\:(.+?)}}/gi, (_, str) => Array.from(str).reverse().join(''));
     content = content.replace(/\{\{\/\/([\s\S]*?)\}\}/gm, '');

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

 const DEFAULT_DEPTH = 4;
 const DEFAULT_WEIGHT = 100;
 const MAX_SCAN_DEPTH = 1000;
 const KNOWN_DECORATORS = ['@@activate', '@@dont_activate'];
 // Typedef area
 /**

@@ -3538,53 +3538,53 @@ export async function getSortedEntries() {
3538	3538	* @param {string} content The content to parse
3539	3539	* @returns {[string[],string]} The decorators found in the content and the content without decorators
3540	3540	*/
3541	3541	function parseDecorators(content) {
3542	3542	/**
3543	3543	* Check if the decorator is known
3544	3544	* @param {string} data string to check
3545	3545	* @returns {boolean} true if the decorator is known
3546	3546	*/
3547	3547	const isKnownDecorator = (data) => {
3548	3548	if (data.startsWith('@@@')) {
3549	3549	data = data.substring(1);
3550	3550	}
3551	3551
3552	3552	for (let i = 0; i < KNOWN_DECORATORS.length; i++) {
3553	3553	if (data.startsWith(KNOWN_DECORATORS[i])) {
3554	3554	return true;
3555	3555	}
3556	3556	}
3557	3557	return false;
3558	3558	};
3559	3559
3560	3560	if (content.startsWith('@@')) {
3561	3561	let newContent = content;
3562	3562	const splited = content.split('\n');
3563	3563	let decorators = [];
3564	3564	let fallbacked = false;
3565	3565
3566	3566	for (let i = 0; i < splited.length; i++) {
3567	3567	if (splited[i].startsWith('@@')) {
3568	3568	if (splited[i].startsWith('@@@') && !fallbacked) {
3569	3569	continue;
3570	3570	}
3571	3571
3572	3572	if (isKnownDecorator(splited[i])) {
3573	3573	decorators.push(splited[i].startsWith('@@@') ? splited[i].substring(1) : splited[i]);
3574	3574	fallbacked = false;
3575	3575	}
3576	3576	else {
3577	3577	fallbacked = true;
3578	3578	}
3579	3579	} else {
3580	3580	newContent = splited.slice(i).join('\n');
3581	3581	break;
3582	3582	}
3583	3583	}
3584	3584	return [decorators, newContent];
3585	3585	}
3586	3586
3587	3587	return [[], content];
3588	3588
3589	3589	}
3590	3590

                 continue;
+            }
             if (decorators.includes('@@activate')) {
                 //activate in any case
                 activatedNow.add(entry);
                 continue;
+            }
             if (decorators.includes('@@dont_activate')) {
                 //deactivate in any case if @@activate is not present
                 continue;
+            }
+-
++
             if (entry.constant || buffer.isExternallyActivated(entry) || isSticky) {
                 activatedNow.add(entry);
                 continue;

src/character-card-parser.js+3 -3 Viewed

     try {
         //change v2 format to v3
         const v3Data = JSON.parse(data);
         v3Data.spec = 'chara_card_v3';
         v3Data.spec_version = '3.0';
         const base64EncodedData = Buffer.from(JSON.stringify(v3Data), 'utf8').toString('base64');
         chunks.splice(-1, 0, PNGtext.encode('ccv3', base64EncodedData));
     } catch (error) { }
     const newBuffer = Buffer.from(encode(chunks));
     return newBuffer;

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

     //_.set(char, 'data.extensions.chat', data.ch_name + ' - ' + humanizedISO8601DateTime());
     // V3 fields
     _.set(char, 'data.group_only_greetings', data.group_only_greetings ?? []);
     if (data.world) {
         try {

Run eslint