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

Run eslint

Browse Source
This commit is contained in:
Cohee
2024-07-14 14:07:23 +03:00
parent fe0b29f606
commit 3fb83e47ec
4 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/scripts/macros.js
View File

@ -464,7 +464,7 @@ export function evaluateMacros(content, env) {
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(/{{reverse\:(.+?)}}/gi, (_, str) => Array.from(str).reverse().join(''));
content = content.replace(/\{\{\/\/([\s\S]*?)\}\}/gm, '');

24
public/scripts/world-info.js
View File

@ -108,7 +108,7 @@ const METADATA_KEY = 'world_info';
const DEFAULT_DEPTH = 4;
const DEFAULT_WEIGHT = 100;
const MAX_SCAN_DEPTH = 1000;
const KNOWN_DECORATORS = ['@@activate', '@@dont_activate']
const KNOWN_DECORATORS = ['@@activate', '@@dont_activate'];
// Typedef area
/**
@ -3546,45 +3546,45 @@ function parseDecorators(content){
*/
const isKnownDecorator = (data) => {
if (data.startsWith('@@@')) {
data = data.substring(1)
data = data.substring(1);
}
for (let i = 0; i < KNOWN_DECORATORS.length; i++) {
if (data.startsWith(KNOWN_DECORATORS[i])) {
return true
return true;
}
}
return false
}
return false;
};
if (content.startsWith('@@')) {
let newContent = content;
const splited = content.split('\n');
let decorators = []
let decorators = [];
let fallbacked = false;
for (let i = 0; i < splited.length; i++) {
if (splited[i].startsWith('@@')) {
if (splited[i].startsWith('@@@') && !fallbacked) {
continue
continue;
}
if (isKnownDecorator(splited[i])) {
decorators.push(splited[i].startsWith('@@@') ? splited[i].substring(1) : splited[i])
fallbacked = false
decorators.push(splited[i].startsWith('@@@') ? splited[i].substring(1) : splited[i]);
fallbacked = false;
}
else {
fallbacked = true
fallbacked = true;
}
} else {
newContent = splited.slice(i).join('\n');
break;
}
}
return [decorators, newContent]
return [decorators, newContent];
}
return [[], content]
return [[], content];
}

4
src/character-card-parser.js
View File

@ -31,8 +31,8 @@ const write = (image, data) => {
try {
//change v2 format to v3
const v3Data = JSON.parse(data);
v3Data.spec = 'chara_card_v3'
v3Data.spec_version = '3.0'
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));

2
src/endpoints/characters.js
View File

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