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

Merge branch 'staging' into ru-l10n

Browse Source
This commit is contained in:
Cohee
2024-05-20 21:45:02 +03:00
parent 1eca18f287 454a71922d
commit 0c36d4e67d
15 changed files with 966 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
package-lock.json generated
View File

@ -61,6 +61,9 @@
"@types/jquery": "^3.5.29", "@types/jquery": "^3.5.29",
"eslint": "^8.55.0", "eslint": "^8.55.0",
"jquery": "^3.6.4" "jquery": "^3.6.4"
},
"engines": {
"node": ">= 18"
} }
}, },
"node_modules/@aashutoshrathi/word-wrap": { "node_modules/@aashutoshrathi/word-wrap": {
@ -3885,7 +3888,6 @@
}, },
"node_modules/punycode": { "node_modules/punycode": {
"version": "2.3.1", "version": "2.3.1",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=6" "node": ">=6"
@ -4435,8 +4437,15 @@
} }
}, },
"node_modules/tr46": { "node_modules/tr46": {
"version": "0.0.3", "version": "5.0.0",
"license": "MIT" "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
"integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",
"dependencies": {
"punycode": "^2.3.1"
},
"engines": {
"node": ">=18"
}
}, },
"node_modules/truncate-utf8-bytes": { "node_modules/truncate-utf8-bytes": {
"version": "1.0.2", "version": "1.0.2",
@ -4585,19 +4594,27 @@
} }
}, },
"node_modules/webidl-conversions": { "node_modules/webidl-conversions": {
"version": "3.0.1", "version": "7.0.0",
"license": "BSD-2-Clause" "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
"integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
"engines": {
"node": ">=12"
}
}, },
"node_modules/whatwg-fetch": { "node_modules/whatwg-fetch": {
"version": "3.6.18", "version": "3.6.18",
"license": "MIT" "license": "MIT"
}, },
"node_modules/whatwg-url": { "node_modules/whatwg-url": {
"version": "5.0.0", "version": "14.0.0",
"license": "MIT", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz",
"integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==",
"dependencies": { "dependencies": {
"tr46": "~0.0.3", "tr46": "^5.0.0",
"webidl-conversions": "^3.0.0" "webidl-conversions": "^7.0.0"
},
"engines": {
"node": ">=18"
} }
}, },
"node_modules/which": { "node_modules/which": {

6
package.json
View File

@ -44,6 +44,9 @@
"yargs": "^17.7.1", "yargs": "^17.7.1",
"yauzl": "^2.10.0" "yauzl": "^2.10.0"
}, },
"engines": {
"node": ">= 18"
},
"overrides": { "overrides": {
"parse-bmfont-xml": { "parse-bmfont-xml": {
"xml2js": "^0.5.0" "xml2js": "^0.5.0"
@ -59,6 +62,9 @@
}, },
"@zeldafan0225/ai_horde": { "@zeldafan0225/ai_horde": {
"esbuild": "npm:dry-uninstall" "esbuild": "npm:dry-uninstall"
},
"node-fetch": {
"whatwg-url": "^14.0.0"
} }
}, },
"name": "sillytavern", "name": "sillytavern",

8
public/index.html
View File

@ -6279,11 +6279,11 @@
</div> </div>
<div id="zoomed_avatar_template" class="template_element"> <div id="zoomed_avatar_template" class="template_element">
<div class="zoomed_avatar"> <div class="zoomed_avatar">
<div class="panelControlBar flex-container">
<div class="fa-fw fa-solid fa-grip drag-grabber"></div>
<div class="fa-fw fa-solid fa-circle-xmark dragClose" id="closeZoom"></div>
</div>
<div class="zoomed_avatar_container"> <div class="zoomed_avatar_container">
<div class="panelControlBar flex-container">
<div class="fa-fw fa-solid fa-grip drag-grabber"></div>
<div class="fa-fw fa-solid fa-circle-xmark dragClose" id="closeZoom"></div>
</div>
<img class="zoomed_avatar_img" src="" data-izoomify-url="" data-izoomify-magnify="1.8" data-izoomify-duration="300" alt=""> <img class="zoomed_avatar_img" src="" data-izoomify-url="" data-izoomify-magnify="1.8" data-izoomify-duration="300" alt="">
</div> </div>
</div> </div>

22
public/script.js
View File

@ -1547,6 +1547,13 @@ function getCharacterSource(chId = this_chid) {
return sourceUrl; return sourceUrl;
} }
const risuId = characters[chId]?.data?.extensions?.risuai?.source;
if (Array.isArray(risuId) && risuId.length && typeof risuId[0] === 'string' && risuId[0].startsWith('risurealm:')) {
const realmId = risuId[0].split(':')[1];
return `https://realm.risuai.net/character/${realmId}`;
}
return ''; return '';
} }
@ -5938,7 +5945,7 @@ export function changeMainAPI() {
getStatusHorde(); getStatusHorde();
getHordeModels(true); getHordeModels(true);
} }
validateDisabledSamplers() validateDisabledSamplers();
setupChatCompletionPromptManager(oai_settings); setupChatCompletionPromptManager(oai_settings);
forceCharacterEditorTokenize(); forceCharacterEditorTokenize();
} }
@ -6169,7 +6176,7 @@ export async function getSettings() {
firstRun = false; firstRun = false;
} }
} }
await validateDisabledSamplers() await validateDisabledSamplers();
settingsReady = true; settingsReady = true;
eventSource.emit(event_types.SETTINGS_LOADED); eventSource.emit(event_types.SETTINGS_LOADED);
} }
@ -10240,19 +10247,8 @@ jQuery(async function () {
if (power_user.zoomed_avatar_magnification) { if (power_user.zoomed_avatar_magnification) {
$('.zoomed_avatar_container').izoomify(); $('.zoomed_avatar_container').izoomify();
} else {
$(`.zoomed_avatar[forChar="${charname}"] .dragClose`).hide();
} }
$('.zoomed_avatar').on('mouseup', (e) => {
if (e.target.closest('.drag-grabber') || e.button !== 0) {
return;
}
$(`.zoomed_avatar[forChar="${charname}"]`).fadeOut(animation_duration, () => {
$(`.zoomed_avatar[forChar="${charname}"]`).remove();
});
});
$('.zoomed_avatar, .zoomed_avatar .dragClose').on('click touchend', (e) => { $('.zoomed_avatar, .zoomed_avatar .dragClose').on('click touchend', (e) => {
if (e.target.closest('.dragClose')) { if (e.target.closest('.dragClose')) {
$(`.zoomed_avatar[forChar="${charname}"]`).fadeOut(animation_duration, () => { $(`.zoomed_avatar[forChar="${charname}"]`).fadeOut(animation_duration, () => {

86
public/scripts/RossAscends-mods.js
View File

@ -424,7 +424,7 @@ function restoreUserInput() {
const userInput = LoadLocal('userInput'); const userInput = LoadLocal('userInput');
if (userInput) { if (userInput) {
$('#send_textarea').val(userInput)[0].dispatchEvent(new Event('input', { bubbles:true })); $('#send_textarea').val(userInput)[0].dispatchEvent(new Event('input', { bubbles: true }));
} }
} }
@ -436,8 +436,6 @@ const saveUserInputDebounced = debounce(saveUserInput);
// Make the DIV element draggable: // Make the DIV element draggable:
// THIRD UPDATE, prevent resize window breaks and smartly handle saving
export function dragElement(elmnt) { export function dragElement(elmnt) {
var hasBeenDraggedByUser = false; var hasBeenDraggedByUser = false;
var isMouseDown = false; var isMouseDown = false;
@ -479,8 +477,8 @@ export function dragElement(elmnt) {
} }
//console.debug(left + width, winWidth, hasBeenDraggedByUser, isMouseDown) //console.debug(left + width, winWidth, hasBeenDraggedByUser, isMouseDown)
const style = getComputedStyle(target); //use computed values because not all CSS are set by default const style = getComputedStyle(target); //use computed values because not all CSS are set by default
height = target.offsetHeight; height = parseInt(style.height) //target.offsetHeight;
width = target.offsetWidth; width = parseInt(style.width) //target.offsetWidth;
top = parseInt(style.top); top = parseInt(style.top);
left = parseInt(style.left); left = parseInt(style.left);
right = parseInt(style.right); right = parseInt(style.right);
@ -494,19 +492,20 @@ export function dragElement(elmnt) {
const topbarstyle = getComputedStyle(topbar); const topbarstyle = getComputedStyle(topbar);
topBarFirstX = parseInt(topbarstyle.marginInline); topBarFirstX = parseInt(topbarstyle.marginInline);
topBarLastY = parseInt(topbarstyle.height); topBarLastY = parseInt(topbarstyle.height);
/*
/*console.log(` console.log(`
winWidth: ${winWidth}, winHeight: ${winHeight} Observer
sheldWidth: ${sheldWidth} winWidth: ${winWidth}, winHeight: ${winHeight}
X: ${$(elmnt).css('left')} sheldWidth: sheldWidth
Y: ${$(elmnt).css('top')} X: ${$(elmnt).css('left')}
MaxX: ${maxX}, MaxY: ${maxY} Y: ${$(elmnt).css('top')}
height: ${height} MaxX: ${maxX}, MaxY: ${maxY}
width: ${width} height: ${height}
Topbar 1st X: ${topBarFirstX} width: ${width}
TopBar lastX: ${topBarLastX} Topbar 1st X: ${topBarFirstX}
`);*/ TopBar lastX: topBarLastX
`);
*/
//prepare an empty poweruser object for the item being altered if we don't have one already //prepare an empty poweruser object for the item being altered if we don't have one already
if (!power_user.movingUIState[elmntName]) { if (!power_user.movingUIState[elmntName]) {
@ -524,24 +523,38 @@ export function dragElement(elmnt) {
} }
//handle resizing //handle resizing
if (!hasBeenDraggedByUser && isMouseDown) { if (!hasBeenDraggedByUser && isMouseDown) { //if user is dragging the resize handle (not in header)
console.debug('saw resize, NOT header drag'); //console.debug('saw resize, NOT header drag');
let imgHeight, imgWidth, imageAspectRatio;
let containerAspectRatio = elmnt.height() / elmnt.width();
//force the zoomed avatar container to always be the same aspect ratio as the inner image
if ($(elmnt).attr('id').startsWith('zoomFor_')) {
let zoomedAvatarImage = $(elmnt).find('.zoomed_avatar_img');
imgHeight = zoomedAvatarImage.height();
imgWidth = zoomedAvatarImage.width();
imageAspectRatio = imgHeight / imgWidth;
}
if (containerAspectRatio !== imageAspectRatio) {
elmnt.css('height', imgHeight);
}
//prevent resizing offscreen //prevent resizing offscreen
if (top + elmnt.height() >= winHeight) { if (top + elmnt.height() >= winHeight) {
console.debug('resizing height to prevent offscreen'); //console.debug('resizing height to prevent offscreen');
elmnt.css('height', winHeight - top - 1 + 'px'); elmnt.css('height', winHeight - top - 1 + 'px');
} }
if (left + elmnt.width() >= winWidth) { if (left + elmnt.width() >= winWidth) {
console.debug('resizing width to prevent offscreen'); //console.debug('resizing width to prevent offscreen');
elmnt.css('width', winWidth - left - 1 + 'px'); elmnt.css('width', winWidth - left - 1 + 'px');
} }
//prevent resizing from top left into the top bar //prevent resizing from top left into the top bar
if (top < topBarLastY && maxX >= topBarFirstX && left <= topBarFirstX if (top < topBarLastY && maxX >= topBarFirstX && left <= topBarFirstX
) { ) {
console.debug('prevent topbar underlap resize'); //console.debug('prevent topbar underlap resize');
elmnt.css('width', width - 1 + 'px'); elmnt.css('width', width - 1 + 'px');
} }
@ -647,19 +660,20 @@ export function dragElement(elmnt) {
// and will defaults to shrink to min value of 100px set in CSS file // and will defaults to shrink to min value of 100px set in CSS file
elmnt.css('height', height); elmnt.css('height', height);
elmnt.css('width', width); elmnt.css('width', width);
/*
console.log(` /*console.log(`
winWidth: ${winWidth}, winHeight: ${winHeight} elementDrag:
sheldWidth: ${sheldWidth} winWidth: ${winWidth}, winHeight: ${winHeight}
X: ${$(elmnt).css('left')} sheldWidth: sheldWidth
Y: ${$(elmnt).css('top')} X: ${$(elmnt).css('left')}
MaxX: ${maxX}, MaxY: ${maxY} Y: ${$(elmnt).css('top')}
height: ${height} MaxX: ${maxX}, MaxY: ${maxY}
width: ${width} height: ${height}
Topbar 1st X: ${topBarFirstX} width: ${width}
TopBar lastX: ${topBarLastX} Topbar 1st X: ${topBarFirstX}
`); TopBar lastX: topBarLastX
*/ `);*/
return; return;
} }

1
public/scripts/char-data.js
View File

@ -73,6 +73,7 @@
* @property {string} [github_repo] - The gitHub repository associated with the character. * @property {string} [github_repo] - The gitHub repository associated with the character.
* @property {string} [source_url] - The source URL associated with the character. * @property {string} [source_url] - The source URL associated with the character.
* @property {{full_path: string}} [chub] - The Chub-specific data associated with the character. * @property {{full_path: string}} [chub] - The Chub-specific data associated with the character.
* @property {{source: string[]}} [risuai] - The RisuAI-specific data associated with the character.
*/ */
/** /**

267
public/scripts/extensions/tts/gsvi.js Normal file
View File

@ -0,0 +1,267 @@
import { saveTtsProviderSettings } from './index.js';
export { GSVITtsProvider };
class GSVITtsProvider {
//########//
// Config //
//########//
settings;
ready = false;
separator = '. ';
characterList = {};
voices = [];
/**
* Perform any text processing before passing to TTS engine.
* @param {string} text Input text
* @returns {string} Processed text
*/
processText(text) {
text = text.replace('<br>', '\n'); // Replace <br> with newline
return text;
}
languageLabels = {
'Multilingual': '多语种混合',
'Chinese': '中文',
'English': '英文',
'Japanese': '日文',
'Chinese-English': '中英混合',
'Japanese-English': '日英混合',
};
defaultSettings = {
provider_endpoint: 'http://127.0.0.1:5000',
language: '多语种混合',
cha_name: '',
character_emotion: 'default',
speed: 1,
top_k: 6,
top_p: 0.85,
temperature: 0.75,
batch_size: 10,
stream: false,
stream_chunk_size: 100,
};
// Added new methods to obtain characters and emotions
async fetchCharacterList() {
const response = await fetch(this.settings.provider_endpoint + '/character_list');
if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.text()}`);
}
const characterList = await response.json();
this.characterList = characterList;
this.voices = Object.keys(characterList);
}
get settingsHtml() {
let html = `
<label for="gsvi_api_language">Text Language</label>
<select id="gsvi_api_language">`;
for (let language in this.languageLabels) {
if (this.languageLabels[language] == this.settings?.language) {
html += `<option value="${this.languageLabels[language]}" selected="selected">${language}</option>`;
continue;
}
html += `<option value="${this.languageLabels[language]}">${language}</option>`;
}
html += `
</select>
<label>GSVI Settings:</label><br/>
<label for="gsvi_tts_endpoint">Provider Endpoint:</label>
<input id="gsvi_tts_endpoint" type="text" class="text_pole" maxlength="250" value="${this.defaultSettings.provider_endpoint}"/>
<label for="gsvi_speed">Speed: <span id="gsvi_tts_speed_output">${this.defaultSettings.speed}</span></label>
<input id="gsvi_speed" type="range" value="${this.defaultSettings.speed}" min="0.5" max="2" step="0.01" />
<label for="gsvi_top_k">Top K: <span id="gsvi_top_k_output">${this.defaultSettings.top_k}</span></label>
<input id="gsvi_top_k" type="range" value="${this.defaultSettings.top_k}" min="0" max="100" step="1" />
<label for="gsvi_top_p">Top P: <span id="gsvi_top_p_output">${this.defaultSettings.top_p}</span></label>
<input id="gsvi_top_p" type="range" value="${this.defaultSettings.top_p}" min="0" max="1" step="0.01" />
<label for="gsvi_temperature">Temperature: <span id="gsvi_tts_temperature_output">${this.defaultSettings.temperature}</span></label>
<input id="gsvi_temperature" type="range" value="${this.defaultSettings.temperature}" min="0.01" max="1" step="0.01" />
<label for="gsvi_batch_size">Batch Size: <span id="gsvi_batch_size_output">${this.defaultSettings.batch_size}</span></label>
<input id="gsvi_batch_size" type="range" value="${this.defaultSettings.batch_size}" min="1" max="35" step="1" />
<label for="gsvi_tts_streaming" class="checkbox_label">
<input id="gsvi_tts_streaming" type="checkbox" ${this.defaultSettings.stream ? 'checked' : ''}/>
<span>Streaming</span>
</label>
<label for="gsvi_stream_chunk_size">Stream Chunk Size: <span id="gsvi_stream_chunk_size_output">${this.defaultSettings.stream_chunk_size}</span></label>
<input id="gsvi_stream_chunk_size" type="range" value="${this.defaultSettings.stream_chunk_size}" min="100" max="400" step="1" />
<p>
For more information, visit the
<a href="https://github.com/X-T-E-R/GPT-SoVITS-Inference" target="_blank">GSVI project page</a>.
</p>
`;
return html;
}
onSettingsChange() {
// Update provider settings based on input fields
this.settings.provider_endpoint = $('#gsvi_tts_endpoint').val();
this.settings.language = $('#gsvi_api_language').val();
// Update the rest of TTS settings based on input fields
this.settings.speed = parseFloat($('#gsvi_speed').val());
this.settings.temperature = parseFloat($('#gsvi_temperature').val());
this.settings.top_k = parseInt($('#gsvi_top_k').val(), 10);
this.settings.top_p = parseFloat($('#gsvi_top_p').val());
this.settings.batch_size = parseInt($('#gsvi_batch_size').val(), 10);
this.settings.stream = $('#gsvi_tts_streaming').is(':checked');
this.settings.stream_chunk_size = parseInt($('#gsvi_stream_chunk_size').val(), 10);
// Update UI to reflect changes
$('#gsvi_tts_speed_output').text(this.settings.speed);
$('#gsvi_tts_temperature_output').text(this.settings.temperature);
$('#gsvi_top_k_output').text(this.settings.top_k);
$('#gsvi_top_p_output').text(this.settings.top_p);
$('#gsvi_stream_chunk_size_output').text(this.settings.stream_chunk_size);
$('#gsvi_batch_size_output').text(this.settings.batch_size);
// Persist settings changes
saveTtsProviderSettings();
}
async loadSettings(settings) {
// Populate Provider UI given input settings
if (Object.keys(settings).length === 0) {
console.info('Using default TTS Provider settings');
}
// Only accept keys defined in defaultSettings
this.settings = { ...this.defaultSettings, ...settings };
// Fetch character and emotion list
// Set initial values from the settings
$('#gsvi_tts_endpoint').val(this.settings.provider_endpoint);
$('#gsvi_api_language').val(this.settings.language);
$('#gsvi_speed').val(this.settings.speed);
$('#gsvi_temperature').val(this.settings.temperature);
$('#gsvi_top_k').val(this.settings.top_k);
$('#gsvi_top_p').val(this.settings.top_p);
$('#gsvi_batch_size').val(this.settings.batch_size);
$('#gsvi_tts_streaming').prop('checked', this.settings.stream);
$('#gsvi_stream_chunk_size').val(this.settings.stream_chunk_size);
// Update UI to reflect initial settings
$('#gsvi_tts_speed_output').text(this.settings.speed);
$('#gsvi_tts_temperature_output').text(this.settings.temperature);
$('#gsvi_top_k_output').text(this.settings.top_k);
$('#gsvi_top_p_output').text(this.settings.top_p);
$('#gsvi_stream_chunk_size_output').text(this.settings.stream_chunk_size);
// Register event listeners to update settings on user interaction
// (Similar to before, ensure event listeners for character and emotion selection are included)
// Register input/change event listeners to update settings on user interaction
$('#gsvi_tts_endpoint').on('input', () => { this.onSettingsChange(); });
$('#gsvi_api_language').on('change', () => { this.onSettingsChange(); });
$('#gsvi_speed').on('input', () => { this.onSettingsChange(); });
$('#gsvi_temperature').on('input', () => { this.onSettingsChange(); });
$('#gsvi_top_k').on('input', () => { this.onSettingsChange(); });
$('#gsvi_top_p').on('input', () => { this.onSettingsChange(); });
$('#gsvi_batch_size').on('input', () => { this.onSettingsChange(); });
$('#gsvi_tts_streaming').on('change', () => { this.onSettingsChange(); });
$('#gsvi_stream_chunk_size').on('input', () => { this.onSettingsChange(); });
await this.checkReady();
console.debug('GSVI: Settings loaded');
}
// Perform a simple readiness check by trying to fetch voiceIds
async checkReady() {
await Promise.allSettled([this.fetchCharacterList()]);
}
async onRefreshClick() {
return;
}
//#################//
// TTS Interfaces //
//#################//
async getVoice(voiceName) {
if (this.voices.length == 0) {
this.fetchCharacterList();
}
if (!this.voices.includes(voiceName)) {
throw `TTS Voice name ${voiceName} not found`;
}
return { name: voiceName, voice_id: voiceName, preview_url: false, lang: 'zh-CN' };
}
async generateTts(text, voiceId) {
const response = await this.fetchTtsGeneration(text, voiceId);
return response;
}
//###########//
// API CALLS //
//###########//
async fetchTtsVoiceObjects() {
if (this.voices.length == 0) {
await this.fetchCharacterList();
}
console.log(this.voices);
const voices = this.voices.map(x => ({ name: x, voice_id: x, preview_url: false, lang: 'zh-CN' }));
return voices;
}
async fetchTtsGeneration(inputText, voiceId) {
console.info(`Generating new TTS for voice_id ${voiceId}`);
const params = new URLSearchParams();
params.append('text', inputText);
params.append('cha_name', voiceId);
params.append('text_language', this.settings.language);
params.append('batch_size', this.settings.batch_size.toString());
params.append('speed', this.settings.speed.toString());
params.append('top_k', this.settings.top_k.toString());
params.append('top_p', this.settings.top_p.toString());
params.append('temperature', this.settings.temperature.toString());
params.append('stream', this.settings.stream.toString());
return `${this.settings.provider_endpoint}/tts?${params.toString()}`;
}
// Interface not used by GSVI TTS
async fetchTtsFromHistory(history_item_id) {
return Promise.resolve(history_item_id);
}
}

2
public/scripts/extensions/tts/index.js
View File

@ -10,6 +10,7 @@ import { NovelTtsProvider } from './novel.js';
import { power_user } from '../../power-user.js'; import { power_user } from '../../power-user.js';
import { OpenAITtsProvider } from './openai.js'; import { OpenAITtsProvider } from './openai.js';
import { XTTSTtsProvider } from './xtts.js'; import { XTTSTtsProvider } from './xtts.js';
import { GSVITtsProvider } from './gsvi.js';
import { AllTalkTtsProvider } from './alltalk.js'; import { AllTalkTtsProvider } from './alltalk.js';
import { SpeechT5TtsProvider } from './speecht5.js'; import { SpeechT5TtsProvider } from './speecht5.js';
import { SlashCommandParser } from '../../slash-commands/SlashCommandParser.js'; import { SlashCommandParser } from '../../slash-commands/SlashCommandParser.js';
@ -74,6 +75,7 @@ const ttsProviders = {
ElevenLabs: ElevenLabsTtsProvider, ElevenLabs: ElevenLabsTtsProvider,
Silero: SileroTtsProvider, Silero: SileroTtsProvider,
XTTSv2: XTTSTtsProvider, XTTSv2: XTTSTtsProvider,
GSVI: GSVITtsProvider,
System: SystemTtsProvider, System: SystemTtsProvider,
Coqui: CoquiTtsProvider, Coqui: CoquiTtsProvider,
Edge: EdgeTtsProvider, Edge: EdgeTtsProvider,

42
public/scripts/power-user.js
View File

@ -1389,7 +1389,7 @@ async function applyTheme(name) {
} }
async function applyMovingUIPreset(name) { async function applyMovingUIPreset(name) {
resetMovablePanels('quiet'); await resetMovablePanels('quiet');
const movingUIPreset = movingUIPresets.find(x => x.name == name); const movingUIPreset = movingUIPresets.find(x => x.name == name);
if (!movingUIPreset) { if (!movingUIPreset) {
@ -1401,6 +1401,7 @@ async function applyMovingUIPreset(name) {
console.log('MovingUI Preset applied: ' + name); console.log('MovingUI Preset applied: ' + name);
loadMovingUIState(); loadMovingUIState();
saveSettingsDebounced()
} }
/** /**
@ -1629,9 +1630,9 @@ function loadPowerUserSettings(settings, data) {
$('#stscript_autocomplete_font_scale_counter').val(power_user.stscript.autocomplete.font.scale ?? defaultStscript.autocomplete.font.scale); $('#stscript_autocomplete_font_scale_counter').val(power_user.stscript.autocomplete.font.scale ?? defaultStscript.autocomplete.font.scale);
document.body.style.setProperty('--ac-font-scale', power_user.stscript.autocomplete.font.scale ?? defaultStscript.autocomplete.font.scale.toString()); document.body.style.setProperty('--ac-font-scale', power_user.stscript.autocomplete.font.scale ?? defaultStscript.autocomplete.font.scale.toString());
$('#stscript_autocomplete_width_left').val(power_user.stscript.autocomplete.width.left ?? AUTOCOMPLETE_WIDTH.CHAT); $('#stscript_autocomplete_width_left').val(power_user.stscript.autocomplete.width.left ?? AUTOCOMPLETE_WIDTH.CHAT);
document.querySelector('#stscript_autocomplete_width_left').dispatchEvent(new Event('input', { bubbles:true })); document.querySelector('#stscript_autocomplete_width_left').dispatchEvent(new Event('input', { bubbles: true }));
$('#stscript_autocomplete_width_right').val(power_user.stscript.autocomplete.width.right ?? AUTOCOMPLETE_WIDTH.CHAT); $('#stscript_autocomplete_width_right').val(power_user.stscript.autocomplete.width.right ?? AUTOCOMPLETE_WIDTH.CHAT);
document.querySelector('#stscript_autocomplete_width_right').dispatchEvent(new Event('input', { bubbles:true })); document.querySelector('#stscript_autocomplete_width_right').dispatchEvent(new Event('input', { bubbles: true }));
$('#restore_user_input').prop('checked', power_user.restore_user_input); $('#restore_user_input').prop('checked', power_user.restore_user_input);
@ -3671,7 +3672,7 @@ $(document).ready(() => {
$('#stscript_autocomplete_font_scale_counter').val(value); $('#stscript_autocomplete_font_scale_counter').val(value);
power_user.stscript.autocomplete.font.scale = Number(value); power_user.stscript.autocomplete.font.scale = Number(value);
document.body.style.setProperty('--ac-font-scale', value.toString()); document.body.style.setProperty('--ac-font-scale', value.toString());
window.dispatchEvent(new Event('resize', { bubbles:true })); window.dispatchEvent(new Event('resize', { bubbles: true }));
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$('#stscript_autocomplete_font_scale_counter').on('input', function () { $('#stscript_autocomplete_font_scale_counter').on('input', function () {
@ -3679,7 +3680,7 @@ $(document).ready(() => {
$('#stscript_autocomplete_font_scale').val(value); $('#stscript_autocomplete_font_scale').val(value);
power_user.stscript.autocomplete.font.scale = Number(value); power_user.stscript.autocomplete.font.scale = Number(value);
document.body.style.setProperty('--ac-font-scale', value.toString()); document.body.style.setProperty('--ac-font-scale', value.toString());
window.dispatchEvent(new Event('resize', { bubbles:true })); window.dispatchEvent(new Event('resize', { bubbles: true }));
saveSettingsDebounced(); saveSettingsDebounced();
}); });
@ -3687,7 +3688,7 @@ $(document).ready(() => {
const value = $(this).val(); const value = $(this).val();
power_user.stscript.autocomplete.width.left = Number(value); power_user.stscript.autocomplete.width.left = Number(value);
/**@type {HTMLElement}*/(this.closest('.doubleRangeInputContainer')).style.setProperty('--value', value.toString()); /**@type {HTMLElement}*/(this.closest('.doubleRangeInputContainer')).style.setProperty('--value', value.toString());
window.dispatchEvent(new Event('resize', { bubbles:true })); window.dispatchEvent(new Event('resize', { bubbles: true }));
saveSettingsDebounced(); saveSettingsDebounced();
}); });
@ -3695,7 +3696,7 @@ $(document).ready(() => {
const value = $(this).val(); const value = $(this).val();
power_user.stscript.autocomplete.width.right = Number(value); power_user.stscript.autocomplete.width.right = Number(value);
/**@type {HTMLElement}*/(this.closest('.doubleRangeInputContainer')).style.setProperty('--value', value.toString()); /**@type {HTMLElement}*/(this.closest('.doubleRangeInputContainer')).style.setProperty('--value', value.toString());
window.dispatchEvent(new Event('resize', { bubbles:true })); window.dispatchEvent(new Event('resize', { bubbles: true }));
saveSettingsDebounced(); saveSettingsDebounced();
}); });
@ -3789,15 +3790,18 @@ $(document).ready(() => {
browser_has_focus = false; browser_has_focus = false;
}); });
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'vn', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'vn',
callback: toggleWaifu, callback: toggleWaifu,
helpString: 'Swaps Visual Novel Mode On/Off', helpString: 'Swaps Visual Novel Mode On/Off',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'newchat', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'newchat',
callback: doNewChat, callback: doNewChat,
helpString: 'Start a new chat with the current character', helpString: 'Start a new chat with the current character',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'random', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'random',
callback: doRandomChat, callback: doRandomChat,
unnamedArgumentList: [ unnamedArgumentList: [
new SlashCommandArgument( new SlashCommandArgument(
@ -3806,7 +3810,8 @@ $(document).ready(() => {
], ],
helpString: 'Start a new chat with a random character. If an argument is provided, only considers characters that have the specified tag.', helpString: 'Start a new chat with a random character. If an argument is provided, only considers characters that have the specified tag.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'delmode', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'delmode',
callback: doDelMode, callback: doDelMode,
aliases: ['del'], aliases: ['del'],
unnamedArgumentList: [ unnamedArgumentList: [
@ -3816,7 +3821,8 @@ $(document).ready(() => {
], ],
helpString: 'Enter message deletion mode, and auto-deletes last N messages if numeric argument is provided.', helpString: 'Enter message deletion mode, and auto-deletes last N messages if numeric argument is provided.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'cut', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'cut',
callback: doMesCut, callback: doMesCut,
returns: 'the text of cut messages separated by a newline', returns: 'the text of cut messages separated by a newline',
unnamedArgumentList: [ unnamedArgumentList: [
@ -3842,16 +3848,19 @@ $(document).ready(() => {
`, `,
aliases: [], aliases: [],
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'resetpanels', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'resetpanels',
callback: doResetPanels, callback: doResetPanels,
helpString: 'resets UI panels to original state', helpString: 'resets UI panels to original state',
aliases: ['resetui'], aliases: ['resetui'],
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'bgcol', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'bgcol',
callback: setAvgBG, callback: setAvgBG,
helpString: '– WIP test of auto-bg avg coloring', helpString: '– WIP test of auto-bg avg coloring',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'theme', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'theme',
callback: setThemeCallback, callback: setThemeCallback,
unnamedArgumentList: [ unnamedArgumentList: [
new SlashCommandArgument( new SlashCommandArgument(
@ -3860,7 +3869,8 @@ $(document).ready(() => {
], ],
helpString: 'sets a UI theme by name', helpString: 'sets a UI theme by name',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'movingui', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'movingui',
callback: setmovingUIPreset, callback: setmovingUIPreset,
unnamedArgumentList: [ unnamedArgumentList: [
new SlashCommandArgument( new SlashCommandArgument(

201
public/scripts/slash-commands.js
View File

@ -73,7 +73,8 @@ export const parser = new SlashCommandParser();
const registerSlashCommand = SlashCommandParser.addCommand.bind(SlashCommandParser); const registerSlashCommand = SlashCommandParser.addCommand.bind(SlashCommandParser);
const getSlashCommandsHelp = parser.getHelpString.bind(parser); const getSlashCommandsHelp = parser.getHelpString.bind(parser);
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: '?', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: '?',
callback: helpCommandCallback, callback: helpCommandCallback,
aliases: ['help'], aliases: ['help'],
unnamedArgumentList: [new SlashCommandArgument( unnamedArgumentList: [new SlashCommandArgument(
@ -81,7 +82,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: '?',
)], )],
helpString: 'Get help on macros, chat formatting and commands.', helpString: 'Get help on macros, chat formatting and commands.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'name', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'name',
callback: setNameCallback, callback: setNameCallback,
unnamedArgumentList: [ unnamedArgumentList: [
new SlashCommandArgument( new SlashCommandArgument(
@ -91,16 +93,19 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'name',
helpString: 'Sets user name and persona avatar (if set).', helpString: 'Sets user name and persona avatar (if set).',
aliases: ['persona'], aliases: ['persona'],
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'sync', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'sync',
callback: syncCallback, callback: syncCallback,
helpString: 'Syncs the user persona in user-attributed messages in the current chat.', helpString: 'Syncs the user persona in user-attributed messages in the current chat.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'lock', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'lock',
callback: bindCallback, callback: bindCallback,
aliases: ['bind'], aliases: ['bind'],
helpString: 'Locks/unlocks a persona (name and avatar) to the current chat', helpString: 'Locks/unlocks a persona (name and avatar) to the current chat',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'bg', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'bg',
callback: setBackgroundCallback, callback: setBackgroundCallback,
aliases: ['background'], aliases: ['background'],
returns: 'the current background', returns: 'the current background',
@ -123,7 +128,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'bg',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'sendas', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'sendas',
callback: sendMessageAs, callback: sendMessageAs,
namedArgumentList: [ namedArgumentList: [
new SlashCommandNamedArgument( new SlashCommandNamedArgument(
@ -161,7 +167,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'sendas',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'sys', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'sys',
callback: sendNarratorMessage, callback: sendNarratorMessage,
aliases: ['nar'], aliases: ['nar'],
namedArgumentList: [ namedArgumentList: [
@ -204,7 +211,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'sys',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'sysname', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'sysname',
callback: setNarratorName, callback: setNarratorName,
unnamedArgumentList: [ unnamedArgumentList: [
new SlashCommandArgument( new SlashCommandArgument(
@ -213,7 +221,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'sysname',
], ],
helpString: 'Sets a name for future system narrator messages in this chat (display only). Default: System. Leave empty to reset.', helpString: 'Sets a name for future system narrator messages in this chat (display only). Default: System. Leave empty to reset.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'comment', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'comment',
callback: sendCommentMessage, callback: sendCommentMessage,
namedArgumentList: [ namedArgumentList: [
new SlashCommandNamedArgument( new SlashCommandNamedArgument(
@ -257,22 +266,26 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'comment',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'single', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'single',
callback: setStoryModeCallback, callback: setStoryModeCallback,
aliases: ['story'], aliases: ['story'],
helpString: 'Sets the message style to single document mode without names or avatars visible.', helpString: 'Sets the message style to single document mode without names or avatars visible.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'bubble', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'bubble',
callback: setBubbleModeCallback, callback: setBubbleModeCallback,
aliases: ['bubbles'], aliases: ['bubbles'],
helpString: 'Sets the message style to bubble chat mode.', helpString: 'Sets the message style to bubble chat mode.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'flat', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'flat',
callback: setFlatModeCallback, callback: setFlatModeCallback,
aliases: ['default'], aliases: ['default'],
helpString: 'Sets the message style to flat chat mode.', helpString: 'Sets the message style to flat chat mode.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'continue', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'continue',
callback: continueChatCallback, callback: continueChatCallback,
aliases: ['cont'], aliases: ['cont'],
unnamedArgumentList: [ unnamedArgumentList: [
@ -299,7 +312,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'continue',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'go', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'go',
callback: goToCharacterCallback, callback: goToCharacterCallback,
unnamedArgumentList: [ unnamedArgumentList: [
new SlashCommandArgument( new SlashCommandArgument(
@ -309,7 +323,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'go',
helpString: 'Opens up a chat with the character or group by its name', helpString: 'Opens up a chat with the character or group by its name',
aliases: ['char'], aliases: ['char'],
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'sysgen', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'sysgen',
callback: generateSystemMessage, callback: generateSystemMessage,
unnamedArgumentList: [ unnamedArgumentList: [
new SlashCommandArgument( new SlashCommandArgument(
@ -318,7 +333,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'sysgen',
], ],
helpString: 'Generates a system message using a specified prompt.', helpString: 'Generates a system message using a specified prompt.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'ask', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'ask',
callback: askCharacter, callback: askCharacter,
unnamedArgumentList: [ unnamedArgumentList: [
new SlashCommandArgument( new SlashCommandArgument(
@ -330,7 +346,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'ask',
], ],
helpString: 'Asks a specified character card a prompt. Character name and prompt have to be separated by a new line.', helpString: 'Asks a specified character card a prompt. Character name and prompt have to be separated by a new line.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'delname', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'delname',
callback: deleteMessagesByNameCallback, callback: deleteMessagesByNameCallback,
namedArgumentList: [], namedArgumentList: [],
unnamedArgumentList: [ unnamedArgumentList: [
@ -353,7 +370,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'delname',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'send', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'send',
callback: sendUserMessageCallback, callback: sendUserMessageCallback,
namedArgumentList: [ namedArgumentList: [
new SlashCommandNamedArgument( new SlashCommandNamedArgument(
@ -408,7 +426,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'send',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'trigger', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'trigger',
callback: triggerGenerationCallback, callback: triggerGenerationCallback,
namedArgumentList: [ namedArgumentList: [
new SlashCommandNamedArgument( new SlashCommandNamedArgument(
@ -429,7 +448,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'trigger',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'hide', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'hide',
callback: hideMessageCallback, callback: hideMessageCallback,
unnamedArgumentList: [ unnamedArgumentList: [
new SlashCommandArgument( new SlashCommandArgument(
@ -438,7 +458,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'hide',
], ],
helpString: 'Hides a chat message from the prompt.', helpString: 'Hides a chat message from the prompt.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'unhide', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'unhide',
callback: unhideMessageCallback, callback: unhideMessageCallback,
unnamedArgumentList: [ unnamedArgumentList: [
new SlashCommandArgument( new SlashCommandArgument(
@ -447,7 +468,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'unhide',
], ],
helpString: 'Unhides a message from the prompt.', helpString: 'Unhides a message from the prompt.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-disable', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'member-disable',
callback: disableGroupMemberCallback, callback: disableGroupMemberCallback,
aliases: ['disable', 'disablemember', 'memberdisable'], aliases: ['disable', 'disablemember', 'memberdisable'],
unnamedArgumentList: [ unnamedArgumentList: [
@ -457,7 +479,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-disab
], ],
helpString: 'Disables a group member from being drafted for replies.', helpString: 'Disables a group member from being drafted for replies.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-enable', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'member-enable',
aliases: ['enable', 'enablemember', 'memberenable'], aliases: ['enable', 'enablemember', 'memberenable'],
callback: enableGroupMemberCallback, callback: enableGroupMemberCallback,
unnamedArgumentList: [ unnamedArgumentList: [
@ -467,7 +490,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-enabl
], ],
helpString: 'Enables a group member to be drafted for replies.', helpString: 'Enables a group member to be drafted for replies.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-add', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'member-add',
callback: addGroupMemberCallback, callback: addGroupMemberCallback,
aliases: ['addmember', 'memberadd'], aliases: ['addmember', 'memberadd'],
unnamedArgumentList: [ unnamedArgumentList: [
@ -489,7 +513,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-add',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-remove', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'member-remove',
callback: removeGroupMemberCallback, callback: removeGroupMemberCallback,
aliases: ['removemember', 'memberremove'], aliases: ['removemember', 'memberremove'],
unnamedArgumentList: [ unnamedArgumentList: [
@ -512,7 +537,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-remov
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-up', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'member-up',
callback: moveGroupMemberUpCallback, callback: moveGroupMemberUpCallback,
aliases: ['upmember', 'memberup'], aliases: ['upmember', 'memberup'],
unnamedArgumentList: [ unnamedArgumentList: [
@ -522,7 +548,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-up',
], ],
helpString: 'Moves a group member up in the group chat list.', helpString: 'Moves a group member up in the group chat list.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-down', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'member-down',
callback: moveGroupMemberDownCallback, callback: moveGroupMemberDownCallback,
aliases: ['downmember', 'memberdown'], aliases: ['downmember', 'memberdown'],
unnamedArgumentList: [ unnamedArgumentList: [
@ -532,7 +559,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-down'
], ],
helpString: 'Moves a group member down in the group chat list.', helpString: 'Moves a group member down in the group chat list.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'peek', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'peek',
callback: peekCallback, callback: peekCallback,
unnamedArgumentList: [ unnamedArgumentList: [
new SlashCommandArgument( new SlashCommandArgument(
@ -558,7 +586,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'peek',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'delswipe', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'delswipe',
callback: deleteSwipeCallback, callback: deleteSwipeCallback,
aliases: ['swipedel'], aliases: ['swipedel'],
unnamedArgumentList: [ unnamedArgumentList: [
@ -585,7 +614,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'delswipe',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'echo', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'echo',
callback: echoCallback, callback: echoCallback,
returns: 'the text', returns: 'the text',
namedArgumentList: [ namedArgumentList: [
@ -615,7 +645,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'echo',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'gen', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'gen',
callback: generateCallback, callback: generateCallback,
returns: 'generated text', returns: 'generated text',
namedArgumentList: [ namedArgumentList: [
@ -646,7 +677,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'gen',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'genraw', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'genraw',
callback: generateRawCallback, callback: generateRawCallback,
returns: 'generated text', returns: 'generated text',
namedArgumentList: [ namedArgumentList: [
@ -692,7 +724,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'genraw',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'addswipe', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'addswipe',
callback: addSwipeCallback, callback: addSwipeCallback,
aliases: ['swipeadd'], aliases: ['swipeadd'],
unnamedArgumentList: [ unnamedArgumentList: [
@ -702,10 +735,12 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'addswipe',
], ],
helpString: 'Adds a swipe to the last chat message.', helpString: 'Adds a swipe to the last chat message.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'abort', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'abort',
callback: abortCallback, callback: abortCallback,
namedArgumentList: [ namedArgumentList: [
SlashCommandNamedArgument.fromProps({ name: 'quiet', SlashCommandNamedArgument.fromProps({
name: 'quiet',
description: 'Whether to suppress the toast message notifying about the /abort call.', description: 'Whether to suppress the toast message notifying about the /abort call.',
typeList: [ARGUMENT_TYPE.BOOLEAN], typeList: [ARGUMENT_TYPE.BOOLEAN],
defaultValue: 'true', defaultValue: 'true',
@ -713,13 +748,15 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'abort',
}), }),
], ],
unnamedArgumentList: [ unnamedArgumentList: [
SlashCommandArgument.fromProps({ description: 'The reason for aborting command execution. Shown when quiet=false', SlashCommandArgument.fromProps({
description: 'The reason for aborting command execution. Shown when quiet=false',
typeList: [ARGUMENT_TYPE.STRING], typeList: [ARGUMENT_TYPE.STRING],
}), }),
], ],
helpString: 'Aborts the slash command batch execution.', helpString: 'Aborts the slash command batch execution.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'fuzzy', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'fuzzy',
callback: fuzzyCallback, callback: fuzzyCallback,
returns: 'first matching item', returns: 'first matching item',
namedArgumentList: [ namedArgumentList: [
@ -758,7 +795,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'fuzzy',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'pass', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'pass',
callback: (_, arg) => arg, callback: (_, arg) => arg,
returns: 'the provided value', returns: 'the provided value',
unnamedArgumentList: [ unnamedArgumentList: [
@ -779,7 +817,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'pass',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'delay', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'delay',
callback: delayCallback, callback: delayCallback,
aliases: ['wait', 'sleep'], aliases: ['wait', 'sleep'],
unnamedArgumentList: [ unnamedArgumentList: [
@ -801,7 +840,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'delay',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'input', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'input',
aliases: ['prompt'], aliases: ['prompt'],
callback: inputCallback, callback: inputCallback,
returns: 'user input', returns: 'user input',
@ -834,7 +874,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'input',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'run', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'run',
aliases: ['call', 'exec'], aliases: ['call', 'exec'],
callback: runCallback, callback: runCallback,
returns: 'result of the executed closure of QR', returns: 'result of the executed closure of QR',
@ -855,7 +896,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'run',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'messages', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'messages',
callback: getMessagesCallback, callback: getMessagesCallback,
aliases: ['message'], aliases: ['message'],
namedArgumentList: [ namedArgumentList: [
@ -866,7 +908,7 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'messages',
'hidden', 'include hidden messages', [ARGUMENT_TYPE.BOOLEAN], false, false, 'on', ['off', 'on'], 'hidden', 'include hidden messages', [ARGUMENT_TYPE.BOOLEAN], false, false, 'on', ['off', 'on'],
), ),
new SlashCommandNamedArgument( new SlashCommandNamedArgument(
'role', 'filter messages by role' , [ARGUMENT_TYPE.STRING], false, false, null, ['system', 'assistant', 'user'], 'role', 'filter messages by role', [ARGUMENT_TYPE.STRING], false, false, null, ['system', 'assistant', 'user'],
), ),
], ],
unnamedArgumentList: [ unnamedArgumentList: [
@ -900,7 +942,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'messages',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'setinput', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'setinput',
callback: setInputCallback, callback: setInputCallback,
unnamedArgumentList: [ unnamedArgumentList: [
new SlashCommandArgument( new SlashCommandArgument(
@ -921,7 +964,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'setinput',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'popup', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'popup',
callback: popupCallback, callback: popupCallback,
returns: 'popup text', returns: 'popup text',
namedArgumentList: [ namedArgumentList: [
@ -955,7 +999,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'popup',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'buttons', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'buttons',
callback: buttonsCallback, callback: buttonsCallback,
returns: 'clicked button label', returns: 'clicked button label',
namedArgumentList: [ namedArgumentList: [
@ -983,7 +1028,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'buttons',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'trimtokens', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'trimtokens',
callback: trimTokensCallback, callback: trimTokensCallback,
returns: 'trimmed text', returns: 'trimmed text',
namedArgumentList: [ namedArgumentList: [
@ -1013,7 +1059,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'trimtokens',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'trimstart', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'trimstart',
callback: trimStartCallback, callback: trimStartCallback,
returns: 'trimmed text', returns: 'trimmed text',
unnamedArgumentList: [ unnamedArgumentList: [
@ -1035,7 +1082,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'trimstart',
</div> </div>
`, `,
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'trimend', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'trimend',
callback: trimEndCallback, callback: trimEndCallback,
returns: 'trimmed text', returns: 'trimmed text',
unnamedArgumentList: [ unnamedArgumentList: [
@ -1045,7 +1093,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'trimend',
], ],
helpString: 'Trims the text to the end of the last full sentence.', helpString: 'Trims the text to the end of the last full sentence.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'inject', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'inject',
callback: injectCallback, callback: injectCallback,
namedArgumentList: [ namedArgumentList: [
new SlashCommandNamedArgument( new SlashCommandNamedArgument(
@ -1071,15 +1120,18 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'inject',
], ],
helpString: 'Injects a text into the LLM prompt for the current chat. Requires a unique injection ID. Positions: "before" main prompt, "after" main prompt, in-"chat" (default: after). Depth: injection depth for the prompt (default: 4). Role: role for in-chat injections (default: system). Scan: include injection content into World Info scans (default: false).', helpString: 'Injects a text into the LLM prompt for the current chat. Requires a unique injection ID. Positions: "before" main prompt, "after" main prompt, in-"chat" (default: after). Depth: injection depth for the prompt (default: 4). Role: role for in-chat injections (default: system). Scan: include injection content into World Info scans (default: false).',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'listinjects', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'listinjects',
callback: listInjectsCallback, callback: listInjectsCallback,
helpString: 'Lists all script injections for the current chat.', helpString: 'Lists all script injections for the current chat.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'flushinjects', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'flushinjects',
callback: flushInjectsCallback, callback: flushInjectsCallback,
helpString: 'Removes all script injections for the current chat.', helpString: 'Removes all script injections for the current chat.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'tokens', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'tokens',
callback: (_, text) => getTokenCountAsync(text), callback: (_, text) => getTokenCountAsync(text),
returns: 'number of tokens', returns: 'number of tokens',
unnamedArgumentList: [ unnamedArgumentList: [
@ -1089,7 +1141,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'tokens',
], ],
helpString: 'Counts the number of tokens in the provided text.', helpString: 'Counts the number of tokens in the provided text.',
})); }));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'model', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'model',
callback: modelCallback, callback: modelCallback,
returns: 'current model', returns: 'current model',
unnamedArgumentList: [ unnamedArgumentList: [
@ -1216,7 +1269,7 @@ export function processChatSlashCommands() {
} }
function setInputCallback(_, value) { function setInputCallback(_, value) {
$('#send_textarea').val(value || '')[0].dispatchEvent(new Event('input', { bubbles:true })); $('#send_textarea').val(value || '')[0].dispatchEvent(new Event('input', { bubbles: true }));
return value; return value;
} }
@ -1410,7 +1463,7 @@ async function runCallback(args, name) {
throw new Error(`"${name}" is not callable.`); throw new Error(`"${name}" is not callable.`);
} }
closure.scope.parent = scope; closure.scope.parent = scope;
closure.argumentList.forEach(arg=>{ closure.argumentList.forEach(arg => {
if (Object.keys(args).includes(arg.name)) { if (Object.keys(args).includes(arg.name)) {
const providedArg = new SlashCommandNamedArgumentAssignment(); const providedArg = new SlashCommandNamedArgumentAssignment();
providedArg.name = arg.name; providedArg.name = arg.name;
@ -1559,7 +1612,7 @@ async function generateRawCallback(args, value) {
} }
// Prevent generate recursion // Prevent generate recursion
$('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true })); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles: true }));
const lock = isTrueBoolean(args?.lock); const lock = isTrueBoolean(args?.lock);
const as = args?.as || 'system'; const as = args?.as || 'system';
const quietToLoud = as === 'char'; const quietToLoud = as === 'char';
@ -1589,7 +1642,7 @@ async function generateCallback(args, value) {
} }
// Prevent generate recursion // Prevent generate recursion
$('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true })); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles: true }));
const lock = isTrueBoolean(args?.lock); const lock = isTrueBoolean(args?.lock);
const as = args?.as || 'system'; const as = args?.as || 'system';
const quietToLoud = as === 'char'; const quietToLoud = as === 'char';
@ -1725,7 +1778,7 @@ async function deleteSwipeCallback(_, arg) {
async function askCharacter(_, text) { async function askCharacter(_, text) {
// Prevent generate recursion // Prevent generate recursion
$('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true })); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles: true }));
// Not supported in group chats // Not supported in group chats
// TODO: Maybe support group chats? // TODO: Maybe support group chats?
@ -2036,7 +2089,7 @@ async function triggerGenerationCallback(args, value) {
} }
// Prevent generate recursion // Prevent generate recursion
$('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true })); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles: true }));
let chid = undefined; let chid = undefined;
@ -2202,7 +2255,7 @@ function continueChatCallback(_, prompt) {
} }
// Prevent infinite recursion // Prevent infinite recursion
$('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true })); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles: true }));
$('#option_continue').trigger('click', { fromSlashCommand: true, additionalPrompt: prompt }); $('#option_continue').trigger('click', { fromSlashCommand: true, additionalPrompt: prompt });
}, 1); }, 1);
@ -2210,7 +2263,7 @@ function continueChatCallback(_, prompt) {
} }
export async function generateSystemMessage(_, prompt) { export async function generateSystemMessage(_, prompt) {
$('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true })); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles: true }));
if (!prompt) { if (!prompt) {
console.warn('WARN: No prompt provided for /sysgen command'); console.warn('WARN: No prompt provided for /sysgen command');
@ -2744,7 +2797,7 @@ export async function executeSlashCommandsOnChatInput(text, options = {}) {
if (options.clearChatInput) { if (options.clearChatInput) {
ta.value = ''; ta.value = '';
ta.dispatchEvent(new Event('input', { bubbles:true })); ta.dispatchEvent(new Event('input', { bubbles: true }));
} }
document.querySelector('#send_textarea').style.setProperty('--prog', '0%'); document.querySelector('#send_textarea').style.setProperty('--prog', '0%');
@ -2759,7 +2812,7 @@ export async function executeSlashCommandsOnChatInput(text, options = {}) {
commandsFromChatInputAbortController = new SlashCommandAbortController(); commandsFromChatInputAbortController = new SlashCommandAbortController();
result = await executeSlashCommandsWithOptions(text, { result = await executeSlashCommandsWithOptions(text, {
abortController: commandsFromChatInputAbortController, abortController: commandsFromChatInputAbortController,
onProgress: (done, total)=>ta.style.setProperty('--prog', `${done / total * 100}%`), onProgress: (done, total) => ta.style.setProperty('--prog', `${done / total * 100}%`),
}); });
if (commandsFromChatInputAbortController.signal.aborted) { if (commandsFromChatInputAbortController.signal.aborted) {
document.querySelector('#form_sheld').classList.add('script_aborted'); document.querySelector('#form_sheld').classList.add('script_aborted');
@ -2775,7 +2828,7 @@ export async function executeSlashCommandsOnChatInput(text, options = {}) {
toastr.error(e.message); toastr.error(e.message);
} }
} finally { } finally {
delay(1000).then(()=>clearCommandProgressDebounced()); delay(1000).then(() => clearCommandProgressDebounced());
commandsFromChatInputAbortController = null; commandsFromChatInputAbortController = null;
deactivateScriptButtons(); deactivateScriptButtons();
@ -2821,7 +2874,7 @@ async function executeSlashCommandsWithOptions(text, options = {}) {
toastr.error( toastr.error(
`${toast}${clickHint}`, `${toast}${clickHint}`,
'SlashCommandParserError', 'SlashCommandParserError',
{ escapeHtml:false, timeOut: 10000, onclick:()=>callPopup(toast, 'text') }, { escapeHtml: false, timeOut: 10000, onclick: () => callPopup(toast, 'text') },
); );
const result = new SlashCommandClosureResult(); const result = new SlashCommandClosureResult();
return result; return result;
@ -2878,11 +2931,25 @@ async function executeSlashCommands(text, handleParserErrors = true, scope = nul
* @param {Boolean} isFloating Whether to show the auto complete as a floating window (e.g., large QR editor) * @param {Boolean} isFloating Whether to show the auto complete as a floating window (e.g., large QR editor)
*/ */
export async function setSlashCommandAutoComplete(textarea, isFloating = false) { export async function setSlashCommandAutoComplete(textarea, isFloating = false) {
function canUseNegativeLookbehind() {
try {
new RegExp('(?<!_)');
return true;
} catch (e) {
return false;
}
}
if (!canUseNegativeLookbehind()) {
console.warn('Cannot use negative lookbehind in this browser');
return;
}
const parser = new SlashCommandParser(); const parser = new SlashCommandParser();
const ac = new AutoComplete( const ac = new AutoComplete(
textarea, textarea,
() => ac.text[0] == '/', () => ac.text[0] == '/',
async(text, index) => await parser.getNameAt(text, index), async (text, index) => await parser.getNameAt(text, index),
isFloating, isFloating,
); );
} }

2
public/scripts/slash-commands/SlashCommandParser.js
View File

@ -109,7 +109,7 @@ export class SlashCommandParser {
return this.text[this.index]; return this.text[this.index];
} }
get endOfText() { get endOfText() {
return this.index >= this.text.length || /^\s+$/.test(this.ahead); return this.index >= this.text.length || (/\s/.test(this.char) && /^\s+$/.test(this.ahead));
} }

38
public/scripts/utils.js
View File

@ -1341,11 +1341,7 @@ export async function extractTextFromHTML(blob, textSelector = 'body') {
*/ */
export async function extractTextFromMarkdown(blob) { export async function extractTextFromMarkdown(blob) {
const markdown = await blob.text(); const markdown = await blob.text();
const converter = new showdown.Converter(); const text = postProcessText(markdown, false);
const html = converter.makeHtml(markdown);
const domParser = new DOMParser();
const document = domParser.parseFromString(DOMPurify.sanitize(html), 'text/html');
const text = postProcessText(document.body.textContent, false);
return text; return text;
} }
@ -1629,14 +1625,30 @@ export function highlightRegex(regexStr) {
regexStr = escapeHtml(regexStr); regexStr = escapeHtml(regexStr);
// Patterns that we want to highlight only if they are not escaped // Patterns that we want to highlight only if they are not escaped
const patterns = { function getPatterns() {
brackets: /(?<!\\)\[.*?\]/g, // Non-escaped squary brackets try {
quantifiers: /(?<!\\)[*+?{}]/g, // Non-escaped quantifiers return {
operators: /(?<!\\)[|.^$()]/g, // Non-escaped operators like | and () brackets: new RegExp('(?<!\\\\)\\[.*?\\]', 'g'), // Non-escaped square brackets
specialChars: /\\./g, quantifiers: new RegExp('(?<!\\\\)[*+?{}]', 'g'), // Non-escaped quantifiers
flags: /(?<=\/)([gimsuy]*)$/g, // Match trailing flags operators: new RegExp('(?<!\\\\)[|.^$()]', 'g'), // Non-escaped operators like | and ()
delimiters: /^\/|(?<![\\<])\//g, // Match leading or trailing delimiters specialChars: new RegExp('\\\\.', 'g'),
}; flags: new RegExp('(?<=\\/)([gimsuy]*)$', 'g'), // Match trailing flags
delimiters: new RegExp('^\\/|(?<![\\\\<])\\/', 'g'), // Match leading or trailing delimiters
};
} catch (error) {
return {
brackets: new RegExp('(\\\\)?\\[.*?\\]', 'g'), // Non-escaped square brackets
quantifiers: new RegExp('(\\\\)?[*+?{}]', 'g'), // Non-escaped quantifiers
operators: new RegExp('(\\\\)?[|.^$()]', 'g'), // Non-escaped operators like | and ()
specialChars: new RegExp('\\\\.', 'g'),
flags: new RegExp('/([gimsuy]*)$', 'g'), // Match trailing flags
delimiters: new RegExp('^/|[^\\\\](/)', 'g'), // Match leading or trailing delimiters
};
}
}
const patterns = getPatterns();
// Function to replace each pattern with a highlighted HTML span // Function to replace each pattern with a highlighted HTML span
const wrapPattern = (pattern, className) => { const wrapPattern = (pattern, className) => {

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

@ -186,7 +186,7 @@ class WorldInfoBuffer {
result += '\n' + this.#recurseBuffer.join('\n'); result += '\n' + this.#recurseBuffer.join('\n');
} }
return this.#transformString(result, entry); return result;
} }
/** /**
@ -204,6 +204,7 @@ class WorldInfoBuffer {
} }
// Otherwise we do normal matching of plaintext with the chosen entry settings // Otherwise we do normal matching of plaintext with the chosen entry settings
haystack = this.#transformString(haystack, entry);
const transformedString = this.#transformString(needle, entry); const transformedString = this.#transformString(needle, entry);
const matchWholeWords = entry.matchWholeWords ?? world_info_match_whole_words; const matchWholeWords = entry.matchWholeWords ?? world_info_match_whole_words;

498
public/style.css
View File

File diff suppressed because it is too large Load Diff

43
src/endpoints/content-manager.js
View File

@ -509,6 +509,40 @@ async function downloadGenericPng(url) {
return null; return null;
} }
/**
* Parse Risu Realm URL to extract the UUID.
* @param {string} url Risu Realm URL
* @returns {string | null} UUID of the character
*/
function parseRisuUrl(url) {
// Example: https://realm.risuai.net/character/7adb0ed8d81855c820b3506980fb40f054ceef010ff0c4bab73730c0ebe92279
// or https://realm.risuai.net/character/7adb0ed8-d818-55c8-20b3-506980fb40f0
const pattern = /^https?:\/\/realm\.risuai\.net\/character\/([a-f0-9-]+)\/?$/i;
const match = url.match(pattern);
return match ? match[1] : null;
}
/**
* Download RisuAI character card
* @param {string} uuid UUID of the character
* @returns {Promise<{buffer: Buffer, fileName: string, fileType: string}>}
*/
async function downloadRisuCharacter(uuid) {
const result = await fetch(`https://realm.risuai.net/api/v1/download/png-v3/${uuid}?non_commercial=true`);
if (!result.ok) {
const text = await result.text();
console.log('RisuAI returned error', result.statusText, text);
throw new Error('Failed to download character');
}
const buffer = await result.buffer();
const fileName = `${sanitize(uuid)}.png`;
const fileType = 'image/png';
return { buffer, fileName, fileType };
}
/** /**
* @param {String} url * @param {String} url
* @returns {String | null } UUID of the character * @returns {String | null } UUID of the character
@ -563,6 +597,7 @@ router.post('/importURL', jsonParser, async (request, response) => {
const isJannnyContent = host.includes('janitorai'); const isJannnyContent = host.includes('janitorai');
const isPygmalionContent = host.includes('pygmalion.chat'); const isPygmalionContent = host.includes('pygmalion.chat');
const isAICharacterCardsContent = host.includes('aicharactercards.com'); const isAICharacterCardsContent = host.includes('aicharactercards.com');
const isRisu = host.includes('realm.risuai.net');
const isGeneric = isHostWhitelisted(host); const isGeneric = isHostWhitelisted(host);
if (isPygmalionContent) { if (isPygmalionContent) {
@ -603,6 +638,14 @@ router.post('/importURL', jsonParser, async (request, response) => {
else { else {
return response.sendStatus(404); return response.sendStatus(404);
} }
} else if (isRisu) {
const uuid = parseRisuUrl(url);
if (!uuid) {
return response.sendStatus(404);
}
type = 'character';
result = await downloadRisuCharacter(uuid);
} else if (isGeneric) { } else if (isGeneric) {
console.log('Downloading from generic url.'); console.log('Downloading from generic url.');
type = 'character'; type = 'character';