Chore: Add code formatting conventions as eslint rules (#5158) * Add code formatting conventions as eslint rules * Improve formatting in addQuickReply

.eslintrc.cjs+23 -0 Viewed

@@ -102,5 +102,28 @@ module.exports = {
102	102	// These rules should eventually be enabled.
103	103	'no-async-promise-executor': 'off',
104	104	'no-inner-declarations': 'off',
	105	+ 'brace-style': 'off',
	106	+ // Additional formatting rules based on codebase conventions
	107	+ 'array-bracket-spacing': ['error', 'never'],
	108	+ 'computed-property-spacing': ['error', 'never'],
	109	+ 'block-spacing': ['error', 'always'],
	110	+ 'keyword-spacing': ['error', { before: true, after: true }],
	111	+ 'space-before-blocks': ['error', 'always'],
	112	+ 'space-before-function-paren': ['error', { anonymous: 'always', named: 'never', asyncArrow: 'always' }],
	113	+ 'space-in-parens': ['error', 'never'],
	114	+ 'comma-spacing': ['error', { before: false, after: true }],
	115	+ 'key-spacing': ['error', { beforeColon: false, afterColon: true }],
	116	+ 'func-call-spacing': ['error', 'never'],
	117	+ 'no-multiple-empty-lines': ['error', { max: 2, maxEOF: 1, maxBOF: 0 }],
	118	+ 'padded-blocks': ['error', 'never'],
	119	+ 'no-whitespace-before-property': 'error',
	120	+ 'space-unary-ops': ['error', { words: true, nonwords: false }],
	121	+ 'arrow-spacing': ['error', { before: true, after: true }],
	122	+ 'template-curly-spacing': ['error', 'never'],
	123	+ 'rest-spread-spacing': ['error', 'never'],
	124	+ 'generator-star-spacing': ['error', { before: false, after: true }],
	125	+ 'yield-star-spacing': ['error', { before: false, after: true }],
	126	+ 'template-tag-spacing': ['error', 'never'],
	127	+ 'switch-colon-spacing': ['error', { after: true, before: false }],
105	128	},
106	129	};

public/script.js+2 -14 Viewed

@@ -2516,7 +2516,6 @@ export function addOneMessage(mes, { type = undefined, insertAfter = null, scrol
2516	2516	* @returns {JQuery<HTMLElement>} Rendered HTMLElement.
2517	2517	*/
2518	2518	export function updateMessageElement(mes, { messageId = chat.length - 1, messageElement = messageTemplate.clone(), adjustMediaScroll = SCROLL_BEHAVIOR.NONE } = {}) {
2519		-
2520	2519	let avatarImg = getThumbnailUrl('persona', user_avatar);
2521	2520
2522	2521	//for non-user messages

@@ -3709,9 +3708,9 @@ class StreamingProcessor {
3709	3708	}
3710	3709
3711	3710	/**
3712	3711	* @returns {GeneratorAsyncGenerator<{ text: string, swipes: string[], logprobs: import('./scripts/logprobs.js').TokenLogprobs, toolCalls: any[], state: any }, void, void>}
3713	3712	*/
3714	3713	async* nullStreamingGeneration() {
3715	3714	throw new Error('Generation function for streaming is not hooked up');
3716	3715	}
3717	3716

@@ -4862,7 +4861,6 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
4862	4861
4863	4862	// Add quiet generation prompt at depth 0
4864	4863	if (quiet_prompt && quiet_prompt.length) {
4865		-
4866	4864	// here name1 is forced for all quiet prompts..why?
4867	4865	const name = name1;
4868	4866	//checks if we are in instruct, if so, formats the chat as such, otherwise just adds the quiet prompt

@@ -5399,7 +5397,6 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
5399	5397	if (!isAborted && power_user.auto_swipe && generatedTextFiltered(getMessage)) {
5400	5398	is_send_press = false;
5401	5399	return await swipe(null, SWIPE_DIRECTION.RIGHT, { source: SWIPE_SOURCE.AUTO_SWIPE, repeated: true, forceMesId: chat.length - 1 });
5402		-
5403	5400	}
5404	5401
5405	5402	console.debug('/api/chats/save called by /Generate');

@@ -6517,7 +6514,6 @@ export async function saveReply({ type, getMessage, fromStreaming = false, title
6517	6514	!fromStreaming && await eventSource.emit(event_types.MESSAGE_RECEIVED, chat_id, type);
6518	6515	addOneMessage(chat[chat_id], { type: 'swipe' });
6519	6516	!fromStreaming && await eventSource.emit(event_types.CHARACTER_MESSAGE_RENDERED, chat_id, type);
6520		-
6521	6517	} else {
6522	6518	console.debug('entering chat update routine for non-swipe post');
6523	6519	const newMessage = {};

@@ -8247,7 +8243,6 @@ export async function getChatsFromFiles(data, isGroupChat) {
8247	8243	currentChat.shift();
8248	8244	}
8249	8245	chat_dict[file_name] = currentChat;
8250		-
8251	8246	} catch (error) {
8252	8247	console.error(error);
8253	8248	}

@@ -9588,7 +9583,6 @@ export async function createOrEditCharacter(e) {
9588	9583	select_rm_info('char_create', avatarId, oldSelectedChar);
9589	9584
9590	9585	crop_data = undefined;
9591		-
9592	9586	} catch (error) {
9593	9587	console.error('Error creating character', error);
9594	9588	toastr.error(t`Failed to create character`);

@@ -9984,7 +9978,6 @@ export async function swipe(event, direction, { source, repeated, message = chat
9984	9978	duration: 0, //used to be 100 //Disabled on Cohee's request. https://github.com/SillyTavern/SillyTavern/pull/4610/files#r2408731744
9985	9979	queue: false,
9986	9980	progress: function (animation, progress, remainingMs) {
9987		-
9988	9981	if (is_animation_scroll) chatElement.scrollTop(getMessageBottomHeight(thisMesDiv));
9989	9982	},
9990	9983	complete: function () {

@@ -10001,7 +9994,6 @@ export async function swipe(event, direction, { source, repeated, message = chat
10001	9994	* @param {boolean} [skipSwipeOut=false]
10002	9995	*/
10003	9996	async function animateSwipe(run_generate = false, skipSwipeOut = false) {
10004		-
10005	9997	if (!skipSwipeOut) {
10006	9998	//Swipe out.
10007	9999	await animateSwipeTransition(mesId, { xEnd: `${swipeRange}px`, duration: swipeDuration });

@@ -10069,7 +10061,6 @@ export async function swipe(event, direction, { source, repeated, message = chat
10069	10061
10070	10062	//If the swipe is not being deleted.
10071	10063	if (source != SWIPE_SOURCE.DELETE && source != SWIPE_SOURCE.BACK) {
10072		-
10073	10064	// Make sure ad-hoc changes to extras are saved before swiping away
10074	10065	syncMesToSwipe(mesId);
10075	10066

@@ -10382,7 +10373,6 @@ export async function doNewChat({ deleteCurrentChat = false } = {}) {
10382	10373	await createOrEditCharacter(new CustomEvent('newChat'));
10383	10374	if (deleteCurrentChat) await delChat(chat_file_for_del + '.jsonl');
10384	10375	}
10385		-
10386	10376	}
10387	10377
10388	10378	/**

@@ -11407,9 +11397,7 @@ jQuery(async function () {
11407	11397
11408	11398	divchat.style.borderRadius = '';
11409	11399	divchat.style.backgroundColor = '';
11410		-
11411	11400	} else {
11412		-
11413	11401	divchat.style.borderRadius = '10px'; // Adjust the value to control the roundness of the corners
11414	11402	divchat.style.backgroundColor = ''; // Set the background color to your preference
11415	11403

public/scripts/BulkEditOverlay.js+2 -2 Viewed

@@ -101,7 +101,7 @@ class CharacterContextMenu {
101	101	* @param {number} characterId
102	102	* @returns {Promise<void>}
103	103	*/
104	104	static persona = async (characterId) => void (await convertCharacterToPersona(characterId));
105	105
106	106	/**
107	107	* Delete one or more characters,

@@ -754,7 +754,7 @@ class BulkEditOverlay {
754	754
755	755	handleContextMenuShow = (event) => {
756	756	event.preventDefault();
757	757	const [x, y] = this.#getContextMenuPosition(event);
758	758	CharacterContextMenu.show(x, y);
759	759	this.#contextMenuOpen = true;
760	760	};

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

@@ -986,7 +986,6 @@ class PromptManager {
986	986	* @returns {void}
987	987	*/
988	988	addPrompt(prompt, identifier) {
989		-
990	989	if (typeof prompt !== 'object' || prompt === null) throw new Error('Object is not a prompt');
991	990
992	991	const newPrompt = {

@@ -1318,7 +1317,6 @@ class PromptManager {
1318	1317	this.updatePromptByIdentifier(identifier, prompt);
1319	1318	debouncedSaveServiceSettings().then(() => this.render());
1320	1319	});
1321		-
1322	1320	}
1323	1321
1324	1322	/**

public/scripts/RossAscends-mods.js+0 -3 Viewed

@@ -101,7 +101,6 @@ observer.observe(document.documentElement, observerConfig);
101	101	* @returns {string} - A human-readable string that represents the time spent generating characters.
102	102	*/
103	103	export function humanizeGenTime(total_gen_time) {
104		-
105	104	//convert time_spent to humanized format of "_ Hours, _ Minutes, _ Seconds" from milliseconds
106	105	let time_spent = total_gen_time || 0;
107	106	time_spent = Math.floor(time_spent / 1000);

@@ -1274,8 +1273,6 @@ export function initRossMods() {
1274	1273	}
1275	1274
1276	1275
1277		-
1278		-
1279	1276	if (event.ctrlKey && /^[1-9]$/.test(event.key)) {
1280	1277	// This will eventually be to trigger quick replies
1281	1278	// event.preventDefault();

public/scripts/autocomplete/AutoComplete.js+0 -5 Viewed

@@ -80,8 +80,6 @@ export class AutoComplete {
80	80	}
81	81
82	82
83		-
84		-
85	83	/**
86	84	* @param {HTMLTextAreaElement|HTMLInputElement} textarea The textarea to receive autocomplete.
87	85	* @param {() => boolean} checkIfActivate Function should return true only if under the current conditions, autocomplete should display (e.g., for slash commands: autoComplete.text[0] == '/')

@@ -414,7 +412,6 @@ export class AutoComplete {
414	412	});
415	413
416	414
417		-
418	415	if (this.isForceHidden) {
419	416	// hidden with escape
420	417	return this.hide();

@@ -465,7 +462,6 @@ export class AutoComplete {
465	462	}
466	463
467	464
468		-
469	465	/**
470	466	* Create updated DOM.
471	467	*/

@@ -514,7 +510,6 @@ export class AutoComplete {
514	510	}
515	511
516	512
517		-
518	513	/**
519	514	* Update position of DOM.
520	515	*/

public/scripts/autocomplete/AutoCompleteFuzzyScore.js+0 -3 Viewed

@@ -1,6 +1,3 @@
1		-
2		-
3		-
4	1	export class AutoCompleteFuzzyScore {
5	2	/**@type {number}*/ start;
6	3	/**@type {number}*/ longestConsecutive;

public/scripts/autocomplete/AutoCompleteNameResult.js+0 -1 Viewed

@@ -2,7 +2,6 @@ import { AutoCompleteNameResultBase } from './AutoCompleteNameResultBase.js';
2	2	import { AutoCompleteSecondaryNameResult } from './AutoCompleteSecondaryNameResult.js';
3	3
4	4
5		-
6	5	export class AutoCompleteNameResult extends AutoCompleteNameResultBase {
7	6	/**
8	7	*

public/scripts/autocomplete/AutoCompleteNameResultBase.js+2 -3 Viewed

@@ -1,14 +1,13 @@
1	1	import { AutoCompleteOption } from './AutoCompleteOption.js';
2	2
3	3
4		-
5	4	export class AutoCompleteNameResultBase {
6	5	/**@type {string} */ name;
7	6	/**@type {number} */ start;
8	7	/**@type {AutoCompleteOption[]} */ optionList = [];
9	8	/**@type {boolean} */ canBeQuoted = false;
10	9	/**@type {()=>string} */ makeNoMatchText = () => `No matches found for "${this.name}"`;
11	10	/**@type {()=>string} */ makeNoOptionsText = () => 'No options';
12	11
13	12
14	13	/**

public/scripts/autocomplete/AutoCompleteOption.js+1 -2 Viewed

@@ -1,7 +1,6 @@
1	1	import { AutoCompleteFuzzyScore } from './AutoCompleteFuzzyScore.js';
2	2
3	3
4		-
5	4	export class AutoCompleteOption {
6	5	/** @type {string} */ name;
7	6	/** @type {string} */ typeIcon;

@@ -72,7 +71,7 @@ export class AutoCompleteOption {
72	71	name.classList.add('name');
73	72	name.classList.add('monospace');
74	73	name.textContent = noSlash ? '' : '/';
75	74	key.split('').forEach(char => {
76	75	const span = document.createElement('span'); {
77	76	span.textContent = char;
78	77	name.append(span);

public/scripts/bulk-edit.js+1 -1 Viewed

@@ -55,7 +55,7 @@ function onSelectAllButtonClick() {
55	55
56	56	if (!atLeastOneSelected) {
57	57	// If none was selected, trigger click on all to deselect all of them
58	58	for (const character of characters) {
59	59	const checked = $(character).find('.bulk_select_checkbox:checked') ?? false;
60	60	if (checked && character instanceof HTMLElement) {
61	61	characterGroupOverlay.toggleSingleCharacter(character);

public/scripts/cfg-scale.js+0 -1 Viewed

@@ -150,7 +150,6 @@ function onCfgMenuItemClick() {
150	150	setTimeout(function () {
151	151	$('#cfgConfig').hide();
152	152	}, animation_duration);
153		-
154	153	}
155	154	//duplicate options menu close handler from script.js
156	155	//because this listener takes priority

public/scripts/chat-backups.js+1 -1 Viewed

@@ -199,7 +199,7 @@ class BackupsBrowser {
199	199	const deleteButton = document.createElement('div');
200	200	deleteButton.classList.add('right_menu_button', 'fa-solid', 'fa-trash');
201	201	deleteButton.title = t`Delete backup`;
202	202	deleteButton.addEventListener('click', async () => {
203	203	const isDeleted = await this.deleteBackup(backup.file_name);
204	204	if (isDeleted) {
205	205	listItem.remove();

public/scripts/data-maid.js+0 -1 Viewed

@@ -251,7 +251,6 @@ class DataMaidDialog {
251	251	categoryElement.remove();
252	252	this.displayEmptyPlaceholder();
253	253	});
254		-
255	254	});
256	255	categoryElement.querySelectorAll('.dataMaidItemDelete').forEach(button => {
257	256	button.addEventListener('click', async () => {

public/scripts/extensions/assets/index.js+1 -2 Viewed

@@ -94,8 +94,7 @@ async function downloadAssetsList(url) {
94	94	updateCurrentAssets().then(async function () {
95	95	fetch(url, { cache: 'no-cache' })
96	96	.then(response => response.json())
97	97	.then(async function (json) {
98		-
99	98	availableAssets = {};
100	99	$('#assets_menu').empty();
101	100

public/scripts/extensions/expressions/index.js+1 -3 Viewed

@@ -1414,7 +1414,6 @@ export async function getExpressionsList({ filterAvailable = false } = {}) {
1414	1414	});
1415	1415
1416	1416	if (apiResult.ok) {
1417		-
1418	1417	const data = await apiResult.json();
1419	1418	expressionsList = data.labels;
1420	1419	return expressionsList;

@@ -1488,7 +1487,6 @@ function chooseSpriteForExpression(spriteFolderName, expression, { prevExpressio
1488	1487	}
1489	1488
1490	1489	return spriteFile;
1491		-
1492	1490	}
1493	1491
1494	1492	/**

@@ -2333,7 +2331,7 @@ function migrateSettings() {
2333	2331	name: 'expression-folder-override',
2334	2332	aliases: ['spriteoverride', 'costume'],
2335	2333	callback: setSpriteFolderCommand,
2336	2334	namedArgumentList: [
2337	2335	SlashCommandNamedArgument.fromProps({
2338	2336	name: 'name',
2339	2337	description: 'Character name to set a subfolder for. If not provided, the character who last sent a message will be used.',

public/scripts/extensions/gallery/index.js+0 -1 Viewed

@@ -791,7 +791,6 @@ async function listGalleryCommand(args) {
791	791
792	792	const items = await getGalleryItems(url);
793	793	return JSON.stringify(items.map(it => it.src));
794		-
795	794	} catch (err) {
796	795	console.error(err);
797	796	}

public/scripts/extensions/quick-reply/api/QuickReplyApi.js+9 -15 Viewed

@@ -10,22 +10,18 @@ export class QuickReplyApi {
10	10	/** @type {SettingsUi} */ settingsUi;
11	11
12	12
13		-
14		-
15	13	constructor(/** @type {QuickReplySettings} */settings, /** @type {SettingsUi} */settingsUi) {
16	14	this.settings = settings;
17	15	this.settingsUi = settingsUi;
18	16	}
19	17
20	18
21		-
22		-
23	19	/**
24	20	* @param {QuickReply} qr
25	21	* @returns {QuickReplySet}
26	22	*/
27	23	getSetByQr(qr) {
28	24	return QuickReplySet.list.find(it => it.qrList.includes(qr));
29	25	}
30	26
31	27	/**

@@ -48,13 +44,11 @@ export class QuickReplyApi {
48	44	getQrByLabel(setName, label) {
49	45	const set = this.getSetByName(setName);
50	46	if (!set) return;
51	47	if (Number.isInteger(label)) return set.qrList.find(it => it.id == label);
52	48	return set.qrList.find(it => it.label == label);
53	49	}
54	50
55	51
56		-
57		-
58	52	/**
59	53	* Executes a quick reply by its index and returns the result.
60	54	*

@@ -63,7 +57,7 @@ export class QuickReplyApi {
63	57	*/
64	58	async executeQuickReplyByIndex(idx) {
65	59	const qr = [...this.settings.config.setList, ...(this.settings.chatConfig?.setList ?? [])]
66	60	.map(it => it.set.qrList)
67	61	.flat()[idx]
68	62	;
69	63	if (qr) {

@@ -400,7 +394,7 @@ export class QuickReplyApi {
400	394	if (oldSet) {
401	395	QuickReplySet.list.splice(QuickReplySet.list.indexOf(oldSet), 1, set);
402	396	} else {
403	397	const idx = QuickReplySet.list.findIndex(it => it.name.localeCompare(name) == 1);
404	398	if (idx > -1) {
405	399	QuickReplySet.list.splice(idx, 0, set);
406	400	} else {

@@ -460,7 +454,7 @@ export class QuickReplyApi {
460	454	* @returns array with the names of all quick reply sets
461	455	*/
462	456	listSets() {
463	457	return QuickReplySet.list.map(it => it.name);
464	458	}
465	459	/**
466	460	* Gets a list of all globally active quick reply sets.

@@ -468,7 +462,7 @@ export class QuickReplyApi {
468	462	* @returns array with the names of all quick reply sets
469	463	*/
470	464	listGlobalSets() {
471	465	return this.settings.config.setList.map(it => it.set.name);
472	466	}
473	467	/**
474	468	* Gets a list of all quick reply sets activated by the current chat.

@@ -476,7 +470,7 @@ export class QuickReplyApi {
476	470	* @returns array with the names of all quick reply sets
477	471	*/
478	472	listChatSets() {
479	473	return this.settings.chatConfig?.setList?.flatMap(it => it.set.name) ?? [];
480	474	}
481	475
482	476	/**

@@ -490,7 +484,7 @@ export class QuickReplyApi {
490	484	if (!set) {
491	485	throw new Error(`No quick reply set with name "${name}" found.`);
492	486	}
493	487	return set.qrList.map(it => it.label);
494	488	}
495	489
496	490	/**

public/scripts/extensions/quick-reply/index.js+13 -17 Viewed

@@ -14,8 +14,6 @@ import { selected_group } from '../../group-chats.js';
14	14	export { debounceAsync };
15	15
16	16
17		-
18		-
19	17	const _VERBOSE = true;
20	18	export const debug = (...msg) => _VERBOSE ? console.debug('[QR2]', ...msg) : null;
21	19	export const log = (...msg) => _VERBOSE ? console.log('[QR2]', ...msg) : null;

@@ -54,8 +52,6 @@ let autoExec;
54	52	export let quickReplyApi;
55	53
56	54
57		-
58		-
59	55	const loadSets = async () => {
60	56	const response = await fetch('/api/settings/get', {
61	57	method: 'POST',

@@ -72,7 +68,7 @@ const loadSets = async () => {
72	68	set.disableSend = set.quickActionEnabled ?? false;
73	69	set.placeBeforeInput = set.placeBeforeInputEnabled ?? false;
74	70	set.injectInput = set.AutoInputInject ?? false;
75	71	set.qrList = set.quickReplySlots.map((slot, idx) => {
76	72	const qr = {};
77	73	qr.id = idx + 1;
78	74	qr.label = slot.label ?? '';

@@ -87,7 +83,7 @@ const loadSets = async () => {
87	83	qr.executeOnNewChat = slot.autoExecute_newChat ?? false;
88	84	qr.executeBeforeGeneration = slot.autoExecute_beforeGeneration ?? false;
89	85	qr.automationId = slot.automationId ?? '';
90	86	qr.contextList = (slot.contextMenu ?? []).map(it => ({
91	87	set: it.preset,
92	88	isChained: it.chain,
93	89	}));

@@ -99,8 +95,8 @@ const loadSets = async () => {
99	95	}
100	96	}
101	97	// need to load QR lists after all sets are loaded to be able to resolve context menu entries
102	98	setList.forEach((set, idx) => {
103	99	QuickReplySet.list[idx].qrList = set.qrList.map(it => QuickReply.from(it));
104	100	QuickReplySet.list[idx].init();
105	101	});
106	102	log('sets: ', QuickReplySet.list);

@@ -140,7 +136,7 @@ const executeIfReadyElseQueue = async (functionToCall, args) => {
140	136	await functionToCall(...args);
141	137	} else {
142	138	log('queueing', { functionToCall, args });
143	139	executeQueue.push(async () => await functionToCall(...args));
144	140	}
145	141	};
146	142

@@ -183,9 +179,9 @@ const init = async () => {
183	179
184	180	buttons = new ButtonUi(settings);
185	181	buttons.show();
186	182	settings.onSave = () => buttons.refresh();
187	183
188	184	globalThis.executeQuickReplyByName = async (name, args = {}, options = {}) => {
189	185	let qr = [
190	186	...settings.config.setList,
191	187	...(settings.chatConfig?.setList ?? []),

@@ -193,14 +189,14 @@ const init = async () => {
193	189	]
194	190	.map(it => it.set.qrList)
195	191	.flat()
196	192	.find(it => it.label == name)
197	193	;
198	194	if (!qr) {
199	195	let [setName, ...qrName] = name.split('.');
200	196	qrName = qrName.join('.');
201	197	let qrs = QuickReplySet.get(setName);
202	198	if (qrs) {
203	199	qr = qrs.qrList.find(it => it.label == qrName);
204	200	}
205	201	}
206	202	if (qr && qr.onExecute) {

@@ -215,7 +211,7 @@ const init = async () => {
215	211	slash.init();
216	212	autoExec = new AutoExecuteHandler(settings);
217	213
218	214	eventSource.on(event_types.APP_READY, async () => await finalizeInit());
219	215
220	216	globalThis.quickReplyApi = quickReplyApi;
221	217	};

@@ -275,14 +271,14 @@ const onChatChanged = async (chatIdx) => {
275	271
276	272	await autoExec.handleChatChanged();
277	273	};
278	274	eventSource.on(event_types.CHAT_CHANGED, (...args) => executeIfReadyElseQueue(onChatChanged, args));
279	275	eventSource.on(event_types.CHARACTER_DELETED, purgeCharacterQuickReplySets);
280	276	eventSource.on(event_types.CHARACTER_RENAMED, updateCharacterQuickReplySets);
281	277
282	278	const onUserMessage = async () => {
283	279	await autoExec.handleUser();
284	280	};
285	281	eventSource.makeFirst(event_types.USER_MESSAGE_RENDERED, (...args) => executeIfReadyElseQueue(onUserMessage, args));
286	282
287	283	const onAiMessage = async (messageId) => {
288	284	if (['...'].includes(chat[messageId]?.mes)) {

@@ -292,7 +288,7 @@ const onAiMessage = async (messageId) => {
292	288
293	289	await autoExec.handleAi();
294	290	};
295	291	eventSource.makeFirst(event_types.CHARACTER_MESSAGE_RENDERED, (...args) => executeIfReadyElseQueue(onAiMessage, args));
296	292
297	293	const onGroupMemberDraft = async () => {
298	294	await autoExec.handleGroupMemberDraft();

public/scripts/extensions/quick-reply/src/AutoExecuteHandler.js+1 -5 Viewed

@@ -8,8 +8,6 @@ export class AutoExecuteHandler {
8	8	/** @type {Boolean[]}*/ preventAutoExecuteStack = [];
9	9
10	10
11		-
12		-
13	11	constructor(/** @type {QuickReplySettings} */settings) {
14	12	this.settings = settings;
15	13	}

@@ -20,13 +18,11 @@ export class AutoExecuteHandler {
20	18	}
21	19
22	20
23		-
24		-
25	21	async performAutoExecute(/** @type {QuickReply[]} */qrList) {
26	22	for (const qr of qrList) {
27	23	this.preventAutoExecuteStack.push(qr.preventAutoExecute);
28	24	try {
29	25	await qr.execute({ isAutoExecute: true });
30	26	} catch (ex) {
31	27	warn(ex);
32	28	} finally {

public/scripts/extensions/quick-reply/src/QuickReply.js+104 -114 Viewed

@@ -22,13 +22,11 @@ export class QuickReply {
22	22	* @param {{ id?: number; contextList?: any; }} props
23	23	*/
24	24	static from(props) {
25	25	props.contextList = (props.contextList ?? []).map((/** @type {any} */ it) => QuickReplyContextLink.from(it));
26	26	return Object.assign(new this(), props);
27	27	}
28	28
29	29
30		-
31		-
32	30	/**@type {number}*/ id;
33	31	/**@type {string}*/ icon;
34	32	/**@type {string}*/ label = '';

@@ -89,8 +87,6 @@ export class QuickReply {
89	87	}
90	88
91	89
92		-
93		-
94	90	unrender() {
95	91	this.dom?.remove();
96	92	this.dom = null;

@@ -129,7 +125,7 @@ export class QuickReply {
129	125	menu.show(evt);
130	126	}
131	127	});
132	128	root.addEventListener('click', (evt) => {
133	129	if (evt.ctrlKey) {
134	130	this.showEditor();
135	131	return;

@@ -169,8 +165,6 @@ export class QuickReply {
169	165	}
170	166
171	167
172		-
173		-
174	168	renderSettings(idx) {
175	169	if (!this.settingsDom) {
176	170	const item = document.createElement('div'); {

@@ -190,7 +184,7 @@ export class QuickReply {
190	184	addNew.classList.add('fa-solid');
191	185	addNew.classList.add('fa-plus');
192	186	addNew.title = 'Add quick reply';
193	187	addNew.addEventListener('click', () => this.onInsertBefore());
194	188	actions.append(addNew);
195	189	}
196	190	const paste = document.createElement('div'); {

@@ -201,7 +195,7 @@ export class QuickReply {
201	195	paste.classList.add('fa-solid');
202	196	paste.classList.add('fa-paste');
203	197	paste.title = 'Add quick reply from clipboard';
204	198	paste.addEventListener('click', async () => {
205	199	const text = await navigator.clipboard.readText();
206	200	this.onInsertBefore(text);
207	201	});

@@ -215,11 +209,11 @@ export class QuickReply {
215	209	importFile.classList.add('fa-solid');
216	210	importFile.classList.add('fa-file-import');
217	211	importFile.title = 'Add quick reply from JSON file';
218	212	importFile.addEventListener('click', async () => {
219	213	const inp = document.createElement('input'); {
220	214	inp.type = 'file';
221	215	inp.accept = '.json';
222	216	inp.addEventListener('change', async () => {
223	217	if (inp.files.length > 0) {
224	218	for (const file of inp.files) {
225	219	const text = await file.text();

@@ -256,7 +250,7 @@ export class QuickReply {
256	250	icon.classList.add('fa-solid');
257	251	icon.classList.add(this.icon);
258	252	}
259	253	icon.addEventListener('click', async () => {
260	254	let value = await showFontAwesomePicker();
261	255	this.updateIcon(value);
262	256	});

@@ -267,7 +261,7 @@ export class QuickReply {
267	261	lbl.classList.add('qr--set-itemLabel');
268	262	lbl.classList.add('text_pole');
269	263	lbl.value = this.label;
270	264	lbl.addEventListener('input', () => this.updateLabel(lbl.value));
271	265	lblContainer.append(lbl);
272	266	}
273	267	itemContent.append(lblContainer);

@@ -283,7 +277,7 @@ export class QuickReply {
283	277	opt.classList.add('fa-solid');
284	278	opt.textContent = '⁝';
285	279	opt.title = 'Additional options:\n - large editor\n - context menu\n - auto-execution\n - tooltip';
286	280	opt.addEventListener('click', () => this.showEditor());
287	281	optContainer.append(opt);
288	282	}
289	283	itemContent.append(optContainer);

@@ -294,7 +288,7 @@ export class QuickReply {
294	288	mes.classList.add('qr--set-itemMessage');
295	289	mes.value = this.message;
296	290	//HACK need to use jQuery to catch the triggered event from the expanded editor
297	291	$(mes).on('input', () => this.updateMessage(mes.value));
298	292	itemContent.append(mes);
299	293	}
300	294	const actions = document.createElement('div'); {

@@ -306,7 +300,7 @@ export class QuickReply {
306	300	move.classList.add('fa-solid');
307	301	move.classList.add('fa-truck-arrow-right');
308	302	move.title = 'Move quick reply to other set';
309	303	move.addEventListener('click', () => this.onTransfer(this));
310	304	actions.append(move);
311	305	}
312	306	const copy = document.createElement('div'); {

@@ -316,7 +310,7 @@ export class QuickReply {
316	310	copy.classList.add('fa-solid');
317	311	copy.classList.add('fa-copy');
318	312	copy.title = 'Copy quick reply to clipboard';
319	313	copy.addEventListener('click', async () => {
320	314	await navigator.clipboard.writeText(JSON.stringify(this));
321	315	copy.classList.add('qr--success');
322	316	await delay(3010);

@@ -331,7 +325,7 @@ export class QuickReply {
331	325	cut.classList.add('fa-solid');
332	326	cut.classList.add('fa-cut');
333	327	cut.title = 'Cut quick reply to clipboard (copy and remove)';
334	328	cut.addEventListener('click', async () => {
335	329	await navigator.clipboard.writeText(JSON.stringify(this));
336	330	this.delete();
337	331	});

@@ -344,8 +338,8 @@ export class QuickReply {
344	338	exp.classList.add('fa-solid');
345	339	exp.classList.add('fa-file-export');
346	340	exp.title = 'Export quick reply as file';
347	341	exp.addEventListener('click', () => {
348	342	const blob = new Blob([JSON.stringify(this)], { type: 'text' });
349	343	const url = URL.createObjectURL(blob);
350	344	const a = document.createElement('a'); {
351	345	a.href = url;

@@ -363,7 +357,7 @@ export class QuickReply {
363	357	del.classList.add('fa-trash-can');
364	358	del.classList.add('redWarningBG');
365	359	del.title = 'Remove Quick Reply\n---\nShift+Click to skip confirmation';
366	360	del.addEventListener('click', async (evt) => {
367	361	if (!evt.shiftKey) {
368	362	const result = await Popup.show.confirm(
369	363	'Remove Quick Reply',

@@ -408,7 +402,7 @@ export class QuickReply {
408	402	else {
409	403	icon.textContent = '…';
410	404	}
411	405	icon.addEventListener('click', async () => {
412	406	let value = await showFontAwesomePicker();
413	407	if (value === null) return;
414	408	if (this.icon) icon.classList.remove(this.icon);

@@ -425,18 +419,18 @@ export class QuickReply {
425	419	/**@type {HTMLInputElement}*/
426	420	const showLabel = dom.querySelector('#qr--modal-showLabel');
427	421	showLabel.checked = this.showLabel;
428	422	showLabel.addEventListener('click', () => {
429	423	this.updateShowLabel(showLabel.checked);
430	424	});
431	425	/**@type {HTMLInputElement}*/
432	426	const label = dom.querySelector('#qr--modal-label');
433	427	label.value = this.label;
434	428	label.addEventListener('input', () => {
435	429	this.updateLabel(label.value);
436	430	});
437	431	let switcherList;
438	432	// @ts-ignore
439	433	dom.querySelector('#qr--modal-switcher').addEventListener('click', (evt) => {
440	434	if (switcherList) {
441	435	switcherList.remove();
442	436	switcherList = null;

@@ -445,15 +439,15 @@ export class QuickReply {
445	439	const list = document.createElement('ul'); {
446	440	switcherList = list;
447	441	list.classList.add('qr--modal-switcherList');
448	442	const makeList = (qrs) => {
449	443	const setItem = document.createElement('li'); {
450	444	setItem.classList.add('qr--modal-switcherItem');
451	445	setItem.addEventListener('click', () => {
452	446	list.innerHTML = '';
453	447	for (const qrs of quickReplyApi.listSets()) {
454	448	const item = document.createElement('li'); {
455	449	item.classList.add('qr--modal-switcherItem');
456	450	item.addEventListener('click', () => {
457	451	list.innerHTML = '';
458	452	makeList(quickReplyApi.getSetByName(qrs));
459	453	});

@@ -484,7 +478,7 @@ export class QuickReply {
484	478	}
485	479	const addItem = document.createElement('li'); {
486	480	addItem.classList.add('qr--modal-switcherItem');
487	481	addItem.addEventListener('click', () => {
488	482	const qr = quickReplyApi.getSetByQr(this).addQuickReply();
489	483	this.editorPopup.completeAffirmative();
490	484	qr.showEditor();

@@ -505,11 +499,11 @@ export class QuickReply {
505	499	}
506	500	list.append(addItem);
507	501	}
508	502	for (const qr of qrs.qrList.toSorted((a, b) => a.label.toLowerCase().localeCompare(b.label.toLowerCase()))) {
509	503	const item = document.createElement('li'); {
510	504	item.classList.add('qr--modal-switcherItem');
511	505	if (qr == this) item.classList.add('qr--current');
512	506	else item.addEventListener('click', () => {
513	507	this.editorPopup.completeAffirmative();
514	508	qr.showEditor();
515	509	});

@@ -588,7 +582,7 @@ export class QuickReply {
588	582	});
589	583	};
590	584	const updateScrollDebounced = updateScroll;
591	585	const updateSyntaxEnabled = () => {
592	586	if (syntax.checked) {
593	587	dom.querySelector('#qr--modal-messageHolder').classList.remove('qr--noSyntax');
594	588	} else {

@@ -623,7 +617,7 @@ export class QuickReply {
623	617	// @ts-ignore
624	618	if (navigator.keyboard) {
625	619	// @ts-ignore
626	620	navigator.keyboard.getLayoutMap().then(it => dom.querySelector('#qr--modal-commentKey').textContent = it.get('Backslash'));
627	621	} else {
628	622	dom.querySelector('#qr--modal-commentKey').closest('small').remove();
629	623	}

@@ -632,12 +626,12 @@ export class QuickReply {
632	626	const message = dom.querySelector('#qr--modal-message');
633	627	this.editorMessage = message;
634	628	message.value = this.message;
635	629	const updateMessageDebounced = debounce((value) => this.updateMessage(value), 10);
636	630	message.addEventListener('input', () => {
637	631	updateMessageDebounced(message.value);
638	632	updateScrollDebounced();
639	633	}, { passive: true });
640	634	const getLineStart = () => {
641	635	const start = message.selectionStart;
642	636	let lineStart;
643	637	if (start == 0 || message.value[start - 1] == '\n') {

@@ -651,7 +645,7 @@ export class QuickReply {
651	645	}
652	646	return lineStart;
653	647	};
654	648	message.addEventListener('keydown', async (evt) => {
655	649	if (this.isExecuting) return;
656	650	if (evt.key == 'Tab' && !evt.shiftKey && !evt.ctrlKey && !evt.altKey) {
657	651	// increase indent

@@ -668,13 +662,13 @@ export class QuickReply {
668	662	document.execCommand('insertText', false, `\t${affectedLines.join('\n\t')}`);
669	663	message.selectionStart = start + 1;
670	664	message.selectionEnd = end + affectedLines.length;
671	665	message.dispatchEvent(new Event('input', { bubbles: true }));
672	666	} else if (!(ac.isReplaceable && ac.isActive)) {
673	667	evt.stopImmediatePropagation();
674	668	evt.stopPropagation();
675	669	// document.execCommand is deprecated (and potentially buggy in some browsers) but the only way to retain undo-history
676	670	document.execCommand('insertText', false, '\t');
677	671	message.dispatchEvent(new Event('input', { bubbles: true }));
678	672	}
679	673	} else if (evt.key == 'Tab' && evt.shiftKey && !evt.ctrlKey && !evt.altKey) {
680	674	// decrease indent

@@ -686,7 +680,7 @@ export class QuickReply {
686	680	const lineStart = getLineStart();
687	681	message.selectionStart = lineStart;
688	682	const affectedLines = message.value.substring(lineStart, end).split('\n');
689	683	const newText = affectedLines.map(it => it.replace(/^\t/, '')).join('\n');
690	684	const delta = affectedLines.join('\n').length - newText.length;
691	685	// document.execCommand is deprecated (and potentially buggy in some browsers) but the only way to retain undo-history
692	686	if (delta > 0) {

@@ -697,7 +691,7 @@ export class QuickReply {
697	691	}
698	692	message.selectionStart = start - (affectedLines[0].startsWith('\t') ? 1 : 0);
699	693	message.selectionEnd = end - delta;
700	694	message.dispatchEvent(new Event('input', { bubbles: true }));
701	695	} else {
702	696	message.selectionStart = start;
703	697	}

@@ -714,7 +708,7 @@ export class QuickReply {
714	708	document.execCommand('insertText', false, `\n${indent}`);
715	709	message.selectionStart = start + 1 + indent.length;
716	710	message.selectionEnd = message.selectionStart;
717	711	message.dispatchEvent(new Event('input', { bubbles: true }));
718	712	}
719	713	} else if (evt.key == 'Enter' && evt.ctrlKey && !evt.shiftKey && !evt.altKey) {
720	714	if (executeShortcut.checked) {

@@ -751,7 +745,7 @@ export class QuickReply {
751	745	parser.parse(message.value, false);
752	746	const start = message.selectionStart;
753	747	const end = message.selectionEnd;
754	748	const comment = parser.commandIndex.findLast(it => it.name == '*' && (it.start <= start && it.end >= start || it.start <= end && it.end >= end));
755	749	if (comment) {
756	750	// uncomment
757	751	let content = message.value.slice(comment.start + 1, comment.end - 1);

@@ -778,15 +772,15 @@ export class QuickReply {
778	772	message.selectionStart = start + 3;
779	773	message.selectionEnd = end + 3;
780	774	}
781	775	message.dispatchEvent(new Event('input', { bubbles: true }));
782	776	}
783	777	});
784	778	const ac = await setSlashCommandAutoComplete(message, true);
785	779	message.addEventListener('wheel', (evt) => {
786	780	updateScrollDebounced(evt);
787	781	});
788	782	// @ts-ignore
789	783	message.addEventListener('scroll', (evt) => {
790	784	updateScrollDebounced();
791	785	});
792	786	let preBreakPointStart;

@@ -794,7 +788,7 @@ export class QuickReply {
794	788	/**
795	789	* @param {SlashCommandBreakPoint} bp
796	790	*/
797	791	const removeBreakpoint = (bp) => {
798	792	// start at -1 because "/" is not included in start-end
799	793	let start = bp.start - 1;
800	794	// step left until forward slash "/"

@@ -812,7 +806,7 @@ export class QuickReply {
812	806	message.selectionEnd = end;
813	807	// document.execCommand is deprecated (and potentially buggy in some browsers) but the only way to retain undo-history
814	808	document.execCommand('insertText', false, '');
815	809	message.dispatchEvent(new Event('input', { bubbles: true }));
816	810	let postStart = preBreakPointStart;
817	811	let postEnd = preBreakPointEnd;
818	812	// set caret back to where it was

@@ -834,12 +828,12 @@ export class QuickReply {
834	828	// selection end was behind breakpoint: move back by length of removed string
835	829	postEnd = preBreakPointEnd - (end - start);
836	830	}
837	831	return { start: postStart, end: postEnd };
838	832	};
839	833	/**
840	834	* @param {SlashCommandExecutor} cmd
841	835	*/
842	836	const addBreakpoint = (cmd) => {
843	837	// start at -1 because "/" is not included in start-end
844	838	let start = cmd.start - 1;
845	839	let indent = '';

@@ -860,16 +854,16 @@ export class QuickReply {
860	854	message.selectionEnd = start;
861	855	// document.execCommand is deprecated (and potentially buggy in some browsers) but the only way to retain undo-history
862	856	document.execCommand('insertText', false, breakpointText);
863	857	message.dispatchEvent(new Event('input', { bubbles: true }));
864	858	return breakpointText.length;
865	859	};
866	860	const toggleBreakpoint = () => {
867	861	const idx = message.selectionStart;
868	862	let postStart = preBreakPointStart;
869	863	let postEnd = preBreakPointEnd;
870	864	const parser = new SlashCommandParser();
871	865	parser.parse(message.value, false);
872	866	const cmdIdx = parser.commandIndex.findLastIndex(it => it.start <= idx);
873	867	if (cmdIdx > -1) {
874	868	const cmd = parser.commandIndex[cmdIdx];
875	869	if (cmd instanceof SlashCommandBreakPoint) {

@@ -891,12 +885,12 @@ export class QuickReply {
891	885	message.selectionEnd = postEnd;
892	886	}
893	887	};
894	888	message.addEventListener('pointerdown', (evt) => {
895	889	if (!evt.ctrlKey || !evt.altKey) return;
896	890	preBreakPointStart = message.selectionStart;
897	891	preBreakPointEnd = message.selectionEnd;
898	892	});
899	893	message.addEventListener('pointerup', async (evt) => {
900	894	if (!evt.ctrlKey || !evt.altKey || message.selectionStart != message.selectionEnd) return;
901	895	toggleBreakpoint();
902	896	});

@@ -910,11 +904,11 @@ export class QuickReply {
910	904	});
911	905	window.addEventListener('resize', resizeListener);
912	906	updateSyntaxEnabled();
913	907	const updateSyntax = () => {
914	908	if (messageSyntaxInner && syntax.checked) {
915	909	morphdom(
916	910	messageSyntaxInner,
917	911	`<div>${hljs.highlight(`${message.value}${message.value.slice(-1) == '\n' ? ' ' : ''}`, { language: 'stscript', ignoreIllegals: true })?.value}</div>`,
918	912	{ childrenOnly: true },
919	913	);
920	914	updateScrollDebounced();

@@ -924,7 +918,7 @@ export class QuickReply {
924	918	const fpsTime = 1000 / 30;
925	919	let lastMessageValue = null;
926	920	let wasSyntax = null;
927	921	const updateSyntaxLoop = () => {
928	922	const now = Date.now();
929	923	// fps limit
930	924	if (now - lastSyntaxUpdate < fpsTime) return requestAnimationFrame(updateSyntaxLoop);

@@ -945,7 +939,7 @@ export class QuickReply {
945	939	updateSyntax();
946	940	requestAnimationFrame(updateSyntaxLoop);
947	941	};
948	942	requestAnimationFrame(() => updateSyntaxLoop());
949	943	message.style.setProperty('text-shadow', 'none', 'important');
950	944	updateWrap();
951	945	updateTabSize();

@@ -955,7 +949,7 @@ export class QuickReply {
955	949	const tpl = dom.querySelector('#qr--ctxItem');
956	950	const linkList = dom.querySelector('#qr--ctxEditor');
957	951	const fillQrSetSelect = (/**@type {HTMLSelectElement}*/select, /**@type {QuickReplyContextLink}*/ link) => {
958	952	[{ name: 'Select a QR set' }, ...QuickReplySet.list.toSorted((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase()))].forEach(qrs => {
959	953	const opt = document.createElement('option'); {
960	954	opt.value = qrs.name;
961	955	opt.textContent = qrs.name;

@@ -1002,7 +996,7 @@ export class QuickReply {
1002	996	addCtxItem(link, this.contextList.length - 1);
1003	997	});
1004	998	const onContextSort = () => {
1005	999	this.contextList = Array.from(linkList.querySelectorAll('.qr--ctxItem')).map((it, idx) => {
1006	1000	const link = this.contextList[Number(it.getAttribute('data-order'))];
1007	1001	it.setAttribute('data-order', String(idx));
1008	1002	return link;

@@ -1019,63 +1013,63 @@ export class QuickReply {
1019	1013	/**@type {HTMLInputElement}*/
1020	1014	const preventAutoExecute = dom.querySelector('#qr--preventAutoExecute');
1021	1015	preventAutoExecute.checked = this.preventAutoExecute;
1022	1016	preventAutoExecute.addEventListener('click', () => {
1023	1017	this.preventAutoExecute = preventAutoExecute.checked;
1024	1018	this.updateContext();
1025	1019	});
1026	1020	/**@type {HTMLInputElement}*/
1027	1021	const isHidden = dom.querySelector('#qr--isHidden');
1028	1022	isHidden.checked = this.isHidden;
1029	1023	isHidden.addEventListener('click', () => {
1030	1024	this.isHidden = isHidden.checked;
1031	1025	this.updateContext();
1032	1026	});
1033	1027	/**@type {HTMLInputElement}*/
1034	1028	const executeOnStartup = dom.querySelector('#qr--executeOnStartup');
1035	1029	executeOnStartup.checked = this.executeOnStartup;
1036	1030	executeOnStartup.addEventListener('click', () => {
1037	1031	this.executeOnStartup = executeOnStartup.checked;
1038	1032	this.updateContext();
1039	1033	});
1040	1034	/**@type {HTMLInputElement}*/
1041	1035	const executeOnUser = dom.querySelector('#qr--executeOnUser');
1042	1036	executeOnUser.checked = this.executeOnUser;
1043	1037	executeOnUser.addEventListener('click', () => {
1044	1038	this.executeOnUser = executeOnUser.checked;
1045	1039	this.updateContext();
1046	1040	});
1047	1041	/**@type {HTMLInputElement}*/
1048	1042	const executeOnAi = dom.querySelector('#qr--executeOnAi');
1049	1043	executeOnAi.checked = this.executeOnAi;
1050	1044	executeOnAi.addEventListener('click', () => {
1051	1045	this.executeOnAi = executeOnAi.checked;
1052	1046	this.updateContext();
1053	1047	});
1054	1048	/**@type {HTMLInputElement}*/
1055	1049	const executeOnChatChange = dom.querySelector('#qr--executeOnChatChange');
1056	1050	executeOnChatChange.checked = this.executeOnChatChange;
1057	1051	executeOnChatChange.addEventListener('click', () => {
1058	1052	this.executeOnChatChange = executeOnChatChange.checked;
1059	1053	this.updateContext();
1060	1054	});
1061	1055	/**@type {HTMLInputElement}*/
1062	1056	const executeOnGroupMemberDraft = dom.querySelector('#qr--executeOnGroupMemberDraft');
1063	1057	executeOnGroupMemberDraft.checked = this.executeOnGroupMemberDraft;
1064	1058	executeOnGroupMemberDraft.addEventListener('click', () => {
1065	1059	this.executeOnGroupMemberDraft = executeOnGroupMemberDraft.checked;
1066	1060	this.updateContext();
1067	1061	});
1068	1062	/**@type {HTMLInputElement}*/
1069	1063	const executeBeforeGeneration = dom.querySelector('#qr--executeBeforeGeneration');
1070	1064	executeBeforeGeneration.checked = this.executeBeforeGeneration;
1071	1065	executeBeforeGeneration.addEventListener('click', () => {
1072	1066	this.executeBeforeGeneration = executeBeforeGeneration.checked;
1073	1067	this.updateContext();
1074	1068	});
1075	1069	/**@type {HTMLInputElement}*/
1076	1070	const executeOnNewChat = dom.querySelector('#qr--executeOnNewChat');
1077	1071	executeOnNewChat.checked = this.executeOnNewChat;
1078	1072	executeOnNewChat.addEventListener('click', () => {
1079	1073	this.executeOnNewChat = executeOnNewChat.checked;
1080	1074	this.updateContext();
1081	1075	});

@@ -1102,13 +1096,13 @@ export class QuickReply {
1102	1096	/**@type {HTMLElement}*/
1103	1097	const executeBtn = dom.querySelector('#qr--modal-execute');
1104	1098	this.editorExecuteBtn = executeBtn;
1105	1099	executeBtn.addEventListener('click', async () => {
1106	1100	await this.executeFromEditor();
1107	1101	});
1108	1102	/**@type {HTMLElement}*/
1109	1103	const executeBtnPause = dom.querySelector('#qr--modal-pause');
1110	1104	this.editorExecuteBtnPause = executeBtnPause;
1111	1105	executeBtnPause.addEventListener('click', async () => {
1112	1106	if (this.abortController) {
1113	1107	if (this.abortController.signal.paused) {
1114	1108	this.abortController.continue('Continue button clicked');

@@ -1122,7 +1116,7 @@ export class QuickReply {
1122	1116	/**@type {HTMLElement}*/
1123	1117	const executeBtnStop = dom.querySelector('#qr--modal-stop');
1124	1118	this.editorExecuteBtnStop = executeBtnStop;
1125	1119	executeBtnStop.addEventListener('click', async () => {
1126	1120	this.abortController?.abort('Stop button clicked');
1127	1121	});
1128	1122

@@ -1131,49 +1125,49 @@ export class QuickReply {
1131	1125	const inputMirror = dom.querySelector('#qr--modal-send_textarea');
1132	1126	// @ts-ignore
1133	1127	inputMirror.value = inputOg.value;
1134	1128	const inputOgMo = new MutationObserver(muts => {
1135	1129	if (muts.find(it => [...it.removedNodes].includes(inputMirror) || [...it.removedNodes].find(n => n.contains(inputMirror)))) {
1136	1130	inputOg.removeEventListener('input', inputOgListener);
1137	1131	}
1138	1132	});
1139	1133	inputOgMo.observe(document.body, { childList: true });
1140	1134	const inputOgListener = () => {
1141	1135	// @ts-ignore
1142	1136	inputMirror.value = inputOg.value;
1143	1137	};
1144	1138	inputOg.addEventListener('input', inputOgListener);
1145	1139	inputMirror.addEventListener('input', () => {
1146	1140	// @ts-ignore
1147	1141	inputOg.value = inputMirror.value;
1148	1142	});
1149	1143
1150	1144	/**@type {HTMLElement}*/
1151	1145	const resumeBtn = dom.querySelector('#qr--modal-resume');
1152	1146	resumeBtn.addEventListener('click', () => {
1153	1147	this.debugController?.resume();
1154	1148	});
1155	1149	/**@type {HTMLElement}*/
1156	1150	const stepBtn = dom.querySelector('#qr--modal-step');
1157	1151	stepBtn.addEventListener('click', () => {
1158	1152	this.debugController?.step();
1159	1153	});
1160	1154	/**@type {HTMLElement}*/
1161	1155	const stepIntoBtn = dom.querySelector('#qr--modal-stepInto');
1162	1156	stepIntoBtn.addEventListener('click', () => {
1163	1157	this.debugController?.stepInto();
1164	1158	});
1165	1159	/**@type {HTMLElement}*/
1166	1160	const stepOutBtn = dom.querySelector('#qr--modal-stepOut');
1167	1161	stepOutBtn.addEventListener('click', () => {
1168	1162	this.debugController?.stepOut();
1169	1163	});
1170	1164	/**@type {HTMLElement}*/
1171	1165	const minimizeBtn = dom.querySelector('#qr--modal-minimize');
1172	1166	minimizeBtn.addEventListener('click', () => {
1173	1167	this.editorDom.classList.add('qr--minimized');
1174	1168	});
1175	1169	const maximizeBtn = dom.querySelector('#qr--modal-maximize');
1176	1170	maximizeBtn.addEventListener('click', () => {
1177	1171	this.editorDom.classList.remove('qr--minimized');
1178	1172	});
1179	1173	/**@type {boolean}*/

@@ -1182,23 +1176,23 @@ export class QuickReply {
1182	1176	let wStart;
1183	1177	/**@type {HTMLElement}*/
1184	1178	const resizeHandle = dom.querySelector('#qr--resizeHandle');
1185	1179	resizeHandle.addEventListener('pointerdown', (evt) => {
1186	1180	if (isResizing) return;
1187	1181	isResizing = true;
1188	1182	evt.preventDefault();
1189	1183	resizeStart = evt.x;
1190	1184	// @ts-ignore
1191	1185	wStart = dom.querySelector('#qr--qrOptions').offsetWidth;
1192	1186	const dragListener = debounce((evt) => {
1193	1187	const w = wStart + resizeStart - evt.x;
1194	1188	// @ts-ignore
1195	1189	dom.querySelector('#qr--qrOptions').style.setProperty('--width', `${w}px`);
1196	1190	}, 5);
1197	1191	window.addEventListener('pointerup', () => {
1198	1192	// @ts-ignore
1199	1193	window.removeEventListener('pointermove', dragListener);
1200	1194	isResizing = false;
1201	1195	}, { once: true });
1202	1196	// @ts-ignore
1203	1197	window.addEventListener('pointermove', dragListener);
1204	1198	});

@@ -1221,13 +1215,13 @@ export class QuickReply {
1221	1215	}
1222	1216	this.clone.style.position = 'fixed';
1223	1217	this.clone.style.visibility = 'hidden';
1224	1218	const mo = new MutationObserver(muts => {
1225	1219	if (muts.find(it => [...it.removedNodes].includes(this.editorMessage) || [...it.removedNodes].find(n => n.contains(this.editorMessage)))) {
1226	1220	this.clone?.remove();
1227	1221	this.clone = null;
1228	1222	}
1229	1223	});
1230	1224	mo.observe(document.body, { childList: true });
1231	1225	}
1232	1226	document.body.append(this.clone);
1233	1227	this.clone.style.width = `${inputRect.width}px`;

@@ -1258,7 +1252,7 @@ export class QuickReply {
1258	1252	}
1259	1253	async executeFromEditor() {
1260	1254	if (this.isExecuting) return;
1261	1255	this.editorPopup.onClosing = () => false;
1262	1256	const uuidCheck = /^[0-9a-z]{8}(-[0-9a-z]{4}){3}-[0-9a-z]{12}$/;
1263	1257	const oText = this.message;
1264	1258	this.isExecuting = true;

@@ -1298,19 +1292,19 @@ export class QuickReply {
1298	1292	});
1299	1293	};
1300	1294	const updateScrollDebounced = updateScroll;
1301	1295	syntax.addEventListener('wheel', (evt) => {
1302	1296	updateScrollDebounced(evt);
1303	1297	});
1304	1298	// @ts-ignore
1305	1299	syntax.addEventListener('scroll', (evt) => {
1306	1300	updateScrollDebounced();
1307	1301	});
1308	1302	try {
1309	1303	this.abortController = new SlashCommandAbortController();
1310	1304	this.debugController = new SlashCommandDebugController();
1311	1305	this.debugController.onBreakPoint = async (closure, executor) => {
1312	1306	this.editorDom.classList.add('qr--isPaused');
1313	1307	syntax.innerHTML = hljs.highlight(`${closure.fullText}${closure.fullText.slice(-1) == '\n' ? ' ' : ''}`, { language: 'stscript', ignoreIllegals: true })?.value;
1314	1308	this.editorMessageLabel.innerHTML = '';
1315	1309	if (uuidCheck.test(closure.source)) {
1316	1310	const p0 = document.createElement('span'); {

@@ -1318,7 +1312,7 @@ export class QuickReply {
1318	1312	this.editorMessageLabel.append(p0);
1319	1313	}
1320	1314	const p1 = document.createElement('strong'); {
1321	1315	p1.textContent = executor.source.slice(0, 5);
1322	1316	this.editorMessageLabel.append(p1);
1323	1317	}
1324	1318	const p2 = document.createElement('span'); {

@@ -1340,7 +1334,7 @@ export class QuickReply {
1340	1334	/**
1341	1335	* @param {SlashCommandScope} scope
1342	1336	*/
1343	1337	const buildVars = (scope, isCurrent = false) => {
1344	1338	if (!isCurrent) {
1345	1339	ci--;
1346	1340	}

@@ -1358,7 +1352,7 @@ export class QuickReply {
1358	1352	}
1359	1353	wrap.append(namedTitle);
1360	1354	}
1361	1355	const keys = new Set([...Object.keys(this.debugController.namedArguments ?? {}), ...(executor.namedArgumentList ?? []).map(it => it.name)]);
1362	1356	for (const key of keys) {
1363	1357	if (key[0] == '_') continue;
1364	1358	const item = document.createElement('div'); {

@@ -1371,7 +1365,7 @@ export class QuickReply {
1371	1365	const vUnresolved = document.createElement('div'); {
1372	1366	vUnresolved.classList.add('qr--val');
1373	1367	vUnresolved.classList.add('qr--singleCol');
1374	1368	const val = executor.namedArgumentList.find(it => it.name == key)?.value;
1375	1369	if (val instanceof SlashCommandClosure) {
1376	1370	vUnresolved.classList.add('qr--closure');
1377	1371	vUnresolved.title = val.rawText;

@@ -1437,7 +1431,7 @@ export class QuickReply {
1437	1431	// @ts-ignore
1438	1432	while (unnamed.length < executor.unnamedArgumentList?.length ?? 0) unnamed.push(undefined);
1439	1433	// @ts-ignore
1440	1434	unnamed = unnamed.map((it, idx) => [executor.unnamedArgumentList?.[idx], it]);
1441	1435	// @ts-ignore
1442	1436	for (const arg of unnamed) {
1443	1437	i++;

@@ -1511,7 +1505,7 @@ export class QuickReply {
1511	1505	title.textContent = isCurrent ? 'Current Scope' : 'Parent Scope';
1512	1506	if (c.source == source) {
1513	1507	let hi;
1514	1508	title.addEventListener('pointerenter', () => {
1515	1509	const loc = this.getEditorPosition(Math.max(0, c.executorList[0].start - 1), c.executorList.slice(-1)[0].end, c.fullText);
1516	1510	const layer = syntax.getBoundingClientRect();
1517	1511	hi = document.createElement('div');

@@ -1522,7 +1516,7 @@ export class QuickReply {
1522	1516	hi.style.height = `${loc.bottom - loc.top}px`;
1523	1517	syntax.append(hi);
1524	1518	});
1525	1519	title.addEventListener('pointerleave', () => hi?.remove());
1526	1520	}
1527	1521	wrap.append(title);
1528	1522	}

@@ -1635,7 +1629,7 @@ export class QuickReply {
1635	1629	}
1636	1630	return wrap;
1637	1631	};
1638	1632	const buildStack = () => {
1639	1633	const wrap = document.createElement('div'); {
1640	1634	wrap.classList.add('qr--stack');
1641	1635	const title = document.createElement('div'); {

@@ -1651,7 +1645,7 @@ export class QuickReply {
1651	1645	item.classList.add('qr--item');
1652	1646	if (executor.source == source) {
1653	1647	let hi;
1654	1648	item.addEventListener('pointerenter', () => {
1655	1649	const loc = this.getEditorPosition(Math.max(0, executor.start - 1), executor.end, c.fullText);
1656	1650	const layer = syntax.getBoundingClientRect();
1657	1651	hi = document.createElement('div');

@@ -1662,7 +1656,7 @@ export class QuickReply {
1662	1656	hi.style.height = `${loc.bottom - loc.top}px`;
1663	1657	syntax.append(hi);
1664	1658	});
1665	1659	item.addEventListener('pointerleave', () => hi?.remove());
1666	1660	}
1667	1661	const cmd = document.createElement('div'); {
1668	1662	cmd.classList.add('qr--cmd');

@@ -1678,7 +1672,7 @@ export class QuickReply {
1678	1672	if (uuidCheck.test(executor.source)) {
1679	1673	const p1 = document.createElement('span'); {
1680	1674	p1.classList.add('qr--fixed');
1681	1675	p1.textContent = executor.source.slice(0, 5);
1682	1676	src.append(p1);
1683	1677	}
1684	1678	const p2 = document.createElement('span'); {

@@ -1756,7 +1750,7 @@ export class QuickReply {
1756	1750	this.editorMessageLabel.innerHTML = '';
1757	1751	this.editorMessageLabel.textContent = 'Message / Command: ';
1758	1752	this.editorMessage.value = oText;
1759	1753	this.editorMessage.dispatchEvent(new Event('input', { bubbles: true }));
1760	1754	this.editorExecutePromise = null;
1761	1755	this.editorExecuteBtn.classList.remove('qr--busy');
1762	1756	this.editorDom.classList.remove('qr--isExecuting');

@@ -1769,8 +1763,6 @@ export class QuickReply {
1769	1763	}
1770	1764
1771	1765
1772		-
1773		-
1774	1766	delete() {
1775	1767	if (this.onDelete) {
1776	1768	this.unrender();

@@ -1870,7 +1862,7 @@ export class QuickReply {
1870	1862	this.updateContext();
1871	1863	}
1872	1864	removeContextLink(setName) {
1873	1865	const idx = this.contextList.findIndex(it => it.set.name == setName);
1874	1866	if (idx > -1) {
1875	1867	this.contextList.splice(idx, 1);
1876	1868	this.updateContext();

@@ -1908,8 +1900,6 @@ export class QuickReply {
1908	1900	}
1909	1901
1910	1902
1911		-
1912		-
1913	1903	toJSON() {
1914	1904	return {
1915	1905	id: this.id,

public/scripts/extensions/quick-reply/src/QuickReplyConfig.js+12 -20 Viewed

@@ -13,25 +13,21 @@ export class QuickReplyConfig {
13	13	/**@type {HTMLElement}*/ setListDom;
14	14
15	15
16		-
17		-
18	16	static from(props) {
19	17	props.setList = props.setList?.map(it => QuickReplySetLink.from(it))?.filter(it => it.set) ?? [];
20	18	const instance = Object.assign(new this(), props);
21	19	instance.init();
22	20	return instance;
23	21	}
24	22
25	23
26		-
27		-
28	24	init() {
29	25	this.setList.forEach(it => this.hookQuickReplyLink(it));
30	26	}
31	27
32	28
33	29	hasSet(qrs) {
34	30	return this.setList.find(it => it.set == qrs) != null;
35	31	}
36	32	addSet(qrs, isVisible = true) {
37	33	if (!this.hasSet(qrs)) {

@@ -45,7 +41,7 @@ export class QuickReplyConfig {
45	41	}
46	42	}
47	43	removeSet(qrs) {
48	44	const idx = this.setList.findIndex(it => it.set == qrs);
49	45	if (idx > -1) {
50	46	this.setList.splice(idx, 1);
51	47	this.update();

@@ -54,13 +50,11 @@ export class QuickReplyConfig {
54	50	}
55	51
56	52
57		-
58		-
59	53	renderSettingsInto(/**@type {HTMLElement}*/root) {
60	54	/**@type {HTMLElement}*/
61	55	this.setListDom = root.querySelector('.qr--setList');
62	56	root.querySelector('.qr--setListAdd').addEventListener('click', () => {
63	57	const newSet = QuickReplySet.list.find(qr => !this.setList.find(qrl => qrl.set == qr));
64	58	if (newSet) {
65	59	this.addSet(newSet);
66	60	} else {

@@ -74,14 +68,14 @@ export class QuickReplyConfig {
74	68	// @ts-ignore
75	69	$(this.setListDom).sortable({
76	70	delay: getSortableDelay(),
77	71	stop: () => this.onSetListSort(),
78	72	});
79	73	this.setList.filter(it => !it.set.isDeleted).forEach((qrl, idx) => this.setListDom.append(qrl.renderSettings(idx)));
80	74	}
81	75
82	76
83	77	onSetListSort() {
84	78	this.setList = Array.from(this.setListDom.children).map((it, idx) => {
85	79	const qrl = this.setList[Number(it.getAttribute('data-order'))];
86	80	qrl.index = idx;
87	81	it.setAttribute('data-order', String(idx));

@@ -91,15 +85,13 @@ export class QuickReplyConfig {
91	85	}
92	86
93	87
94		-
95		-
96	88	/**
97	89	* @param {QuickReplySetLink} qrl
98	90	*/
99	91	hookQuickReplyLink(qrl) {
100	92	qrl.onDelete = () => this.deleteQuickReplyLink(qrl);
101	93	qrl.onUpdate = () => this.update();
102	94	qrl.onRequestEditSet = () => this.requestEditSet(qrl.set);
103	95	}
104	96
105	97	deleteQuickReplyLink(qrl) {

public/scripts/extensions/quick-reply/src/QuickReplyContextLink.js+0 -2 Viewed

@@ -8,8 +8,6 @@ export class QuickReplyContextLink {
8	8	}
9	9
10	10
11		-
12		-
13	11	/**@type {QuickReplySet}*/ set;
14	12	/**@type {Boolean}*/ isChained = false;
15	13

public/scripts/extensions/quick-reply/src/QuickReplySet.js+25 -26 Viewed

@@ -24,7 +24,7 @@ export class QuickReplySet {
24	24	* @param {string} name - name of the QuickReplySet
25	25	*/
26	26	static get(name) {
27	27	return this.list.find(it => it.name == name);
28	28	}
29	29
30	30	/**@type {string}*/ name;

@@ -42,11 +42,11 @@ export class QuickReplySet {
42	42	/**@type {HTMLElement}*/ settingsDom;
43	43
44	44	constructor() {
45	45	this.save = debounceAsync(() => this.performSave(), 200);
46	46	}
47	47
48	48	init() {
49	49	this.qrList.forEach(qr => this.hookQuickReply(qr));
50	50	}
51	51
52	52	unrender() {

@@ -60,7 +60,7 @@ export class QuickReplySet {
60	60	this.dom = root;
61	61	root.classList.add('qr--buttons');
62	62	this.updateColor();
63	63	this.qrList.filter(qr => !qr.isHidden).forEach(qr => {
64	64	root.append(qr.render());
65	65	});
66	66	}

@@ -70,7 +70,7 @@ export class QuickReplySet {
70	70	rerender() {
71	71	if (!this.dom) return;
72	72	this.dom.innerHTML = '';
73	73	this.qrList.filter(qr => !qr.isHidden).forEach(qr => {
74	74	this.dom.append(qr.render());
75	75	});
76	76	}

@@ -95,7 +95,7 @@ export class QuickReplySet {
95	95	if (!this.settingsDom) {
96	96	this.settingsDom = document.createElement('div'); {
97	97	this.settingsDom.classList.add('qr--set-qrListContents');
98	98	this.qrList.forEach((qr, idx) => {
99	99	this.renderSettingsItem(qr, idx);
100	100	});
101	101	}

@@ -138,12 +138,12 @@ export class QuickReplySet {
138	138	*/
139	139	async executeWithOptions(qr, options = {}) {
140	140	options = Object.assign({
141	141	message: null,
142	142	isAutoExecute: false,
143	143	isEditor: false,
144	144	isRun: false,
145	145	scope: null,
146	146	executionOptions: {},
147	147	}, options);
148	148	const execOptions = options.executionOptions;
149	149	/**@type {HTMLTextAreaElement}*/

@@ -208,9 +208,8 @@ export class QuickReplySet {
208	208	}
209	209
210	210	addQuickReply(data = {}) {
211	211	const id = Math.max(this.idIndex, this.qrList.reduce((max, qr) => Math.max(max, qr.id), 0)) + 1;
212		- data.id =
	212	+ data.id = this.idIndex = id + 1;
213		- this.idIndex = id + 1;
214	213	const qr = QuickReply.from(data);
215	214	this.qrList.push(qr);
216	215	this.hookQuickReply(qr);

@@ -257,11 +256,11 @@ export class QuickReplySet {
257	256	*/
258	257	hookQuickReply(qr) {
259	258	// @ts-ignore
260	259	qr.onDebug = () => this.debug(qr);
261	260	qr.onExecute = (_, options) => this.executeWithOptions(qr, options);
262	261	qr.onDelete = () => this.removeQuickReply(qr);
263	262	qr.onUpdate = () => this.save();
264	263	qr.onInsertBefore = (qrJson) => {
265	264	this.addQuickReplyFromText(qrJson);
266	265	const newQr = this.qrList.pop();
267	266	this.qrList.splice(this.qrList.indexOf(qr), 0, newQr);

@@ -270,7 +269,7 @@ export class QuickReplySet {
270	269	}
271	270	this.save();
272	271	};
273	272	qr.onTransfer = async () => {
274	273	/**@type {HTMLSelectElement} */
275	274	let sel;
276	275	let isCopy = false;

@@ -301,14 +300,14 @@ export class QuickReplySet {
301	300	sel.append(opt);
302	301	}
303	302	}
304	303	sel.addEventListener('keyup', (evt) => {
305	304	if (evt.key == 'Shift') {
306	305	// @ts-ignore
307	306	(dlg.dom ?? dlg.dlg).classList.remove('qr--isCopy');
308	307	return;
309	308	}
310	309	});
311	310	sel.addEventListener('keydown', (evt) => {
312	311	if (evt.key == 'Shift') {
313	312	// @ts-ignore
314	313	(dlg.dom ?? dlg.dlg).classList.add('qr--isCopy');

@@ -330,12 +329,12 @@ export class QuickReplySet {
330	329	dom.append(hintP);
331	330	}
332	331	}
333	332	const dlg = new Popup(dom, POPUP_TYPE.CONFIRM, null, { okButton: 'Transfer', cancelButton: 'Cancel' });
334	333	const copyBtn = document.createElement('div'); {
335	334	copyBtn.classList.add('qr--copy');
336	335	copyBtn.classList.add('menu_button');
337	336	copyBtn.textContent = 'Copy';
338	337	copyBtn.addEventListener('click', () => {
339	338	isCopy = true;
340	339	dlg.completeAffirmative();
341	340	});

@@ -346,7 +345,7 @@ export class QuickReplySet {
346	345	sel.focus();
347	346	await prom;
348	347	if (dlg.result == POPUP_RESULT.AFFIRMATIVE) {
349	348	const qrs = QuickReplySet.list.find(it => it.name == sel.value);
350	349	qrs.addQuickReply(qr.toJSON());
351	350	if (!isCopy) {
352	351	qr.delete();

public/scripts/extensions/quick-reply/src/QuickReplySetLink.js+6 -14 Viewed

@@ -9,8 +9,6 @@ export class QuickReplySetLink {
9	9	}
10	10
11	11
12		-
13		-
14	12	/**@type {QuickReplySet}*/ set;
15	13	/**@type {Boolean}*/ isVisible = true;
16	14

@@ -23,8 +21,6 @@ export class QuickReplySetLink {
23	21	/**@type {HTMLElement}*/ settingsDom;
24	22
25	23
26		-
27		-
28	24	renderSettings(idx) {
29	25	this.index = idx;
30	26	const item = document.createElement('div'); {

@@ -40,12 +36,12 @@ export class QuickReplySetLink {
40	36	const set = document.createElement('select'); {
41	37	set.classList.add('qr--set');
42	38	// fix for jQuery sortable breaking childrens' touch events
43	39	set.addEventListener('touchstart', (evt) => evt.stopPropagation());
44	40	set.addEventListener('change', () => {
45	41	this.set = QuickReplySet.get(set.value);
46	42	this.update();
47	43	});
48	44	QuickReplySet.list.toSorted((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase())).forEach(qrs => {
49	45	const opt = document.createElement('option'); {
50	46	opt.value = qrs.name;
51	47	opt.textContent = qrs.name;

@@ -61,7 +57,7 @@ export class QuickReplySetLink {
61	57	const cb = document.createElement('input'); {
62	58	cb.type = 'checkbox';
63	59	cb.checked = this.isVisible;
64	60	cb.addEventListener('click', () => {
65	61	this.isVisible = cb.checked;
66	62	this.update();
67	63	});

@@ -76,7 +72,7 @@ export class QuickReplySetLink {
76	72	edit.classList.add('fa-solid');
77	73	edit.classList.add('fa-pencil');
78	74	edit.title = 'Edit quick reply set';
79	75	edit.addEventListener('click', () => this.requestEditSet());
80	76	item.append(edit);
81	77	}
82	78	const del = document.createElement('div'); {

@@ -86,7 +82,7 @@ export class QuickReplySetLink {
86	82	del.classList.add('fa-solid');
87	83	del.classList.add('fa-trash-can');
88	84	del.title = 'Remove quick reply set';
89	85	del.addEventListener('click', () => this.delete());
90	86	item.append(del);
91	87	}
92	88	}

@@ -98,8 +94,6 @@ export class QuickReplySetLink {
98	94	}
99	95
100	96
101		-
102		-
103	97	update() {
104	98	if (this.onUpdate) {
105	99	this.onUpdate(this);

@@ -118,8 +112,6 @@ export class QuickReplySetLink {
118	112	}
119	113
120	114
121		-
122		-
123	115	toJSON() {
124	116	return {
125	117	set: this.set.name,

public/scripts/extensions/quick-reply/src/QuickReplySettings.js+2 -8 Viewed

@@ -15,8 +15,6 @@ export class QuickReplySettings {
15	15	}
16	16
17	17
18		-
19		-
20	18	/**@type {Boolean}*/ isEnabled = false;
21	19	/**@type {Boolean}*/ isCombined = false;
22	20	/**@type {Boolean}*/ isPopout = false;

@@ -50,8 +48,6 @@ export class QuickReplySettings {
50	48	/**@type {Function}*/ onRequestEditSet;
51	49
52	50
53		-
54		-
55	51	init() {
56	52	this.hookConfig(this.config);
57	53	this.hookConfig(this.chatConfig);

@@ -60,8 +56,8 @@ export class QuickReplySettings {
60	56
61	57	hookConfig(config) {
62	58	if (config) {
63	59	config.onUpdate = () => this.save();
64	60	config.onRequestEditSet = (qrs) => this.requestEditSet(qrs);
65	61	}
66	62	}
67	63	unhookConfig(config) {

@@ -72,8 +68,6 @@ export class QuickReplySettings {
72	68	}
73	69
74	70
75		-
76		-
77	71	save() {
78	72	extension_settings.quickReplyV2 = this.toJSON();
79	73	saveSettingsDebounced();

public/scripts/extensions/quick-reply/src/SlashCommandHandler.js+13 -21 Viewed

@@ -16,15 +16,11 @@ export class SlashCommandHandler {
16	16	/** @type {QuickReplyApi} */ api;
17	17
18	18
19		-
20		-
21	19	constructor(/** @type {QuickReplyApi} */api) {
22	20	this.api = api;
23	21	}
24	22
25	23
26		-
27		-
28	24	init() {
29	25	function getExecutionIcons(/** @type {QuickReply} */ qr) {
30	26	let icons = '';

@@ -56,7 +52,7 @@ export class SlashCommandHandler {
56	52	qrIds: (executor) => QuickReplySet.get(String(executor.namedArgumentList.find(x => x.name == 'set')?.value))?.qrList.map(qr => {
57	53	const icons = getExecutionIcons(qr);
58	54	const message = `${qr.automationId ? `[${qr.automationId}]` : ''}${icons ? `[auto: ${icons}]` : ''} ${qr.title || qr.message}`.trim();
59	55	return new SlashCommandEnumValue(qr.label, message, enumTypes.enum, enumIcons.qr, null, () => qr.id.toString(), true);
60	56	}) ?? [],
61	57
62	58	/** All QRs as a set.name string, to be able to execute, for example via the /run command */

@@ -352,7 +348,7 @@ export class SlashCommandHandler {
352	348	return '';
353	349	},
354	350	returns: 'updated quick reply',
355	351	namedArgumentList: [...qrUpdateArgs, ...qrArgs.map(it => {
356	352	if (it.name == 'label') {
357	353	const clone = SlashCommandNamedArgument.fromProps(it);
358	354	clone.isRequired = false;

@@ -691,16 +687,16 @@ export class SlashCommandHandler {
691	687	if (!args.from) throw new Error('/import requires from= to be set.');
692	688	if (!value) throw new Error('/import requires the unnamed argument to be set.');
693	689	let qr = [...this.api.listGlobalSets(), ...this.api.listChatSets()]
694	690	.map(it => this.api.getSetByName(it)?.qrList ?? [])
695	691	.flat()
696	692	.find(it => it.label == args.from)
697	693	;
698	694	if (!qr) {
699	695	let [setName, ...qrNameParts] = args.from.split('.');
700	696	let qrName = qrNameParts.join('.');
701	697	let qrs = QuickReplySet.get(setName);
702	698	if (qrs) {
703	699	qr = qrs.qrList.find(it => it.label == qrName);
704	700	}
705	701	}
706	702	if (qr) {

@@ -709,23 +705,23 @@ export class SlashCommandHandler {
709	705	if (args._debugController) {
710	706	closure.source = args.from;
711	707	}
712	708	const testCandidates = (executor) => {
713	709	return (
714	710	executor.namedArgumentList.find(arg => arg.name == 'key')
715	711	&& executor.unnamedArgumentList.length > 0
716	712	&& executor.unnamedArgumentList[0].value instanceof SlashCommandClosure
717	713	) || (
718	714	!executor.namedArgumentList.find(arg => arg.name == 'key')
719	715	&& executor.unnamedArgumentList.length > 1
720	716	&& executor.unnamedArgumentList[1].value instanceof SlashCommandClosure
721	717	);
722	718	};
723	719	const candidates = closure.executorList
724	720	.filter(executor => ['let', 'var'].includes(executor.command.name))
725	721	.filter(testCandidates)
726	722	.map(executor => ({
727	723	key: executor.namedArgumentList.find(arg => arg.name == 'key')?.value ?? executor.unnamedArgumentList[0].value,
728	724	value: executor.unnamedArgumentList[executor.namedArgumentList.find(arg => arg.name == 'key') ? 0 : 1].value,
729	725	}))
730	726	;
731	727	for (let i = 0; i < value.length; i++) {

@@ -735,7 +731,7 @@ export class SlashCommandHandler {
735	731	dstName = value[i + 2];
736	732	i += 2;
737	733	}
738	734	const pick = candidates.find(it => it.key == srcName);
739	735	if (!pick) throw new Error(`No scoped closure named "${srcName}" found in "${args.from}"`);
740	736	if (args._scope.existsVariableInScope(dstName)) {
741	737	args._scope.setVariable(dstName, pick.value);

@@ -783,8 +779,6 @@ export class SlashCommandHandler {
783	779	}
784	780
785	781
786		-
787		-
788	782	getSetByName(name) {
789	783	const set = this.api.getSetByName(name);
790	784	if (!set) {

@@ -802,8 +796,6 @@ export class SlashCommandHandler {
802	796	}
803	797
804	798
805		-
806		-
807	799	async executeQuickReplyByIndex(idx) {
808	800	try {
809	801	return await this.api.executeQuickReplyByIndex(idx);

public/scripts/extensions/quick-reply/src/ui/ButtonUi.js+6 -14 Viewed

@@ -10,15 +10,11 @@ export class ButtonUi {
10	10	/**@type {HTMLElement}*/ popoutDom;
11	11
12	12
13		-
14		-
15	13	constructor(/**@type {QuickReplySettings}*/settings) {
16	14	this.settings = settings;
17	15	}
18	16
19	17
20		-
21		-
22	18	render() {
23	19	if (this.settings.isPopout) {
24	20	return this.renderPopout();

@@ -57,8 +53,6 @@ export class ButtonUi {
57	53	}
58	54
59	55
60		-
61		-
62	56	renderBar() {
63	57	if (!this.dom) {
64	58	let buttonHolder;

@@ -75,7 +69,7 @@ export class ButtonUi {
75	69	popout.classList.add('menu_button');
76	70	popout.classList.add('fa-solid');
77	71	popout.classList.add('fa-window-restore');
78	72	popout.addEventListener('click', () => {
79	73	this.settings.isPopout = true;
80	74	this.refresh();
81	75	this.settings.save();

@@ -91,8 +85,8 @@ export class ButtonUi {
91	85	}
92	86	}
93	87	[...this.settings.config.setList, ...(this.settings.chatConfig?.setList ?? []), ...(this.settings.charConfig?.setList ?? [])]
94	88	.filter(link => link.isVisible)
95	89	.forEach(link => buttonHolder.append(link.set.render()))
96	90	;
97	91	}
98	92	}

@@ -100,8 +94,6 @@ export class ButtonUi {
100	94	}
101	95
102	96
103		-
104		-
105	97	renderPopout() {
106	98	if (!this.popoutDom) {
107	99	let buttonHolder;

@@ -130,7 +122,7 @@ export class ButtonUi {
130	122	close.classList.add('fa-solid');
131	123	close.classList.add('fa-circle-xmark');
132	124	close.classList.add('hoverglow');
133	125	close.addEventListener('click', () => {
134	126	this.settings.isPopout = false;
135	127	this.refresh();
136	128	this.settings.save();

@@ -151,8 +143,8 @@ export class ButtonUi {
151	143	}
152	144	}
153	145	[...this.settings.config.setList, ...(this.settings.chatConfig?.setList ?? []), ...(this.settings.charConfig?.setList ?? [])]
154	146	.filter(link => link.isVisible)
155	147	.forEach(link => buttonHolder.append(link.set.render()))
156	148	;
157	149	root.append(body);
158	150	}

public/scripts/extensions/quick-reply/src/ui/SettingsUi.js+30 -38 Viewed

@@ -29,24 +29,18 @@ export class SettingsUi {
29	29	/**@type {HTMLSelectElement}*/ currentSet;
30	30
31	31
32		-
33		-
34	32	constructor(/**@type {QuickReplySettings}*/settings) {
35	33	this.settings = settings;
36	34	settings.onRequestEditSet = (qrs) => this.selectQrSet(qrs);
37	35	}
38	36
39	37
40		-
41		-
42		-
43		-
44	38	rerender() {
45	39	if (!this.dom) return;
46	40	const content = this.dom.querySelector('.inline-drawer-content');
47	41	content.innerHTML = '';
48	42	// @ts-ignore
49	43	Array.from(this.template.querySelector('.inline-drawer-content').cloneNode(true).children).forEach(el => {
50	44	content.append(el);
51	45	});
52	46	this.prepareDom();

@@ -75,15 +69,15 @@ export class SettingsUi {
75	69	// general settings
76	70	this.isEnabled = this.dom.querySelector('#qr--isEnabled');
77	71	this.isEnabled.checked = this.settings.isEnabled;
78	72	this.isEnabled.addEventListener('click', () => this.onIsEnabled());
79	73
80	74	this.isCombined = this.dom.querySelector('#qr--isCombined');
81	75	this.isCombined.checked = this.settings.isCombined;
82	76	this.isCombined.addEventListener('click', () => this.onIsCombined());
83	77
84	78	this.showPopoutButton = this.dom.querySelector('#qr--showPopoutButton');
85	79	this.showPopoutButton.checked = this.settings.showPopoutButton;
86	80	this.showPopoutButton.addEventListener('click', () => this.onShowPopoutButton());
87	81	}
88	82
89	83	prepareGlobalSetList() {

@@ -131,29 +125,29 @@ export class SettingsUi {
131	125	prepareQrEditor() {
132	126	// qr editor
133	127	this.dom.querySelector('#qr--set-rename').addEventListener('click', async () => this.renameQrSet());
134	128	this.dom.querySelector('#qr--set-new').addEventListener('click', async () => this.addQrSet());
135	129	/**@type {HTMLInputElement}*/
136	130	const importFile = this.dom.querySelector('#qr--set-importFile');
137	131	importFile.addEventListener('change', async () => {
138	132	await this.importQrSet(importFile.files);
139	133	importFile.value = null;
140	134	});
141	135	this.dom.querySelector('#qr--set-import').addEventListener('click', () => importFile.click());
142	136	this.dom.querySelector('#qr--set-export').addEventListener('click', async () => this.exportQrSet());
143	137	this.dom.querySelector('#qr--set-duplicate').addEventListener('click', async () => this.duplicateQrSet());
144	138	this.dom.querySelector('#qr--set-delete').addEventListener('click', async () => this.deleteQrSet());
145	139	this.dom.querySelector('#qr--set-add').addEventListener('click', async () => {
146	140	this.currentQrSet.addQuickReply();
147	141	});
148	142	this.dom.querySelector('#qr--set-paste').addEventListener('click', async () => {
149	143	const text = await navigator.clipboard.readText();
150	144	this.currentQrSet.addQuickReplyFromText(text);
151	145	});
152	146	this.dom.querySelector('#qr--set-importQr').addEventListener('click', async () => {
153	147	const inp = document.createElement('input'); {
154	148	inp.type = 'file';
155	149	inp.accept = '.json';
156	150	inp.addEventListener('change', async () => {
157	151	if (inp.files.length > 0) {
158	152	for (const file of inp.files) {
159	153	const text = await file.text();

@@ -166,8 +160,8 @@ export class SettingsUi {
166	160	});
167	161	this.qrList = this.dom.querySelector('#qr--set-qrList');
168	162	this.currentSet = this.dom.querySelector('#qr--set');
169	163	this.currentSet.addEventListener('change', () => this.onQrSetChange());
170	164	QuickReplySet.list.toSorted((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase())).forEach(qrs => {
171	165	const opt = document.createElement('option'); {
172	166	opt.value = qrs.name;
173	167	opt.textContent = qrs.name;

@@ -175,19 +169,19 @@ export class SettingsUi {
175	169	}
176	170	});
177	171	this.disableSend = this.dom.querySelector('#qr--disableSend');
178	172	this.disableSend.addEventListener('click', () => {
179	173	const qrs = this.currentQrSet;
180	174	qrs.disableSend = this.disableSend.checked;
181	175	qrs.save();
182	176	});
183	177	this.placeBeforeInput = this.dom.querySelector('#qr--placeBeforeInput');
184	178	this.placeBeforeInput.addEventListener('click', () => {
185	179	const qrs = this.currentQrSet;
186	180	qrs.placeBeforeInput = this.placeBeforeInput.checked;
187	181	qrs.save();
188	182	});
189	183	this.injectInput = this.dom.querySelector('#qr--injectInput');
190	184	this.injectInput.addEventListener('click', () => {
191	185	const qrs = this.currentQrSet;
192	186	qrs.injectInput = this.injectInput.checked;
193	187	qrs.save();

@@ -196,7 +190,7 @@ export class SettingsUi {
196	190	this.color = this.dom.querySelector('#qr--color');
197	191	// @ts-ignore
198	192	this.color.color = this.currentQrSet?.color ?? 'transparent';
199	193	this.color.addEventListener('change', (evt) => {
200	194	if (!this.dom.closest('body')) return;
201	195	const qrs = this.currentQrSet;
202	196	if (initialColorChange) {

@@ -211,7 +205,7 @@ export class SettingsUi {
211	205	this.currentQrSet.updateColor();
212	206	});
213	207	// @ts-ignore
214	208	this.dom.querySelector('#qr--colorClear').addEventListener('click', (evt) => {
215	209	const qrs = this.currentQrSet;
216	210	// @ts-ignore
217	211	this.color.color = 'transparent';

@@ -219,7 +213,7 @@ export class SettingsUi {
219	213	this.currentQrSet.updateColor();
220	214	});
221	215	this.onlyBorderColor = this.dom.querySelector('#qr--onlyBorderColor');
222	216	this.onlyBorderColor.addEventListener('click', () => {
223	217	const qrs = this.currentQrSet;
224	218	qrs.onlyBorderColor = this.onlyBorderColor.checked;
225	219	qrs.save();

@@ -242,7 +236,7 @@ export class SettingsUi {
242	236	$(qrsDom).sortable({
243	237	delay: getSortableDelay(),
244	238	handle: '.drag-handle',
245	239	stop: () => this.onQrListSort(),
246	240	});
247	241	}
248	242

@@ -256,8 +250,6 @@ export class SettingsUi {
256	250	}
257	251
258	252
259		-
260		-
261	253	async onIsEnabled() {
262	254	this.settings.isEnabled = this.isEnabled.checked;
263	255	this.settings.save();

@@ -274,7 +266,7 @@ export class SettingsUi {
274	266	}
275	267
276	268	async onGlobalSetListSort() {
277	269	this.settings.config.setList = Array.from(this.globalSetList.children).map((it, idx) => {
278	270	const set = this.settings.config.setList[Number(it.getAttribute('data-order'))];
279	271	it.setAttribute('data-order', String(idx));
280	272	return set;

@@ -283,7 +275,7 @@ export class SettingsUi {
283	275	}
284	276
285	277	async onChatSetListSort() {
286	278	this.settings.chatConfig.setList = Array.from(this.chatSetList.children).map((it, idx) => {
287	279	const set = this.settings.chatConfig.setList[Number(it.getAttribute('data-order'))];
288	280	it.setAttribute('data-order', String(idx));
289	281	return set;

@@ -292,14 +284,14 @@ export class SettingsUi {
292	284	}
293	285
294	286	updateOrder(list) {
295	287	Array.from(list.children).forEach((it, idx) => {
296	288	it.setAttribute('data-order', idx);
297	289	});
298	290	}
299	291
300	292	async onQrListSort() {
301	293	this.currentQrSet.qrList = Array.from(this.qrList.querySelectorAll('.qr--set-item')).map((it, idx) => {
302	294	const qr = this.currentQrSet.qrList.find(qr => qr.id == Number(it.getAttribute('data-id')));
303	295	it.setAttribute('data-order', String(idx));
304	296	return qr;
305	297	});

@@ -408,7 +400,7 @@ export class SettingsUi {
408	400	const qrs = new QuickReplySet();
409	401	qrs.name = name;
410	402	qrs.addQuickReply();
411	403	const idx = QuickReplySet.list.findIndex(it => it.name.toLowerCase().localeCompare(name.toLowerCase()) == 1);
412	404	if (idx > -1) {
413	405	QuickReplySet.list.splice(idx, 0, qrs);
414	406	} else {

@@ -448,7 +440,7 @@ export class SettingsUi {
448	440	} else {
449	441	/**@type {QuickReplySet}*/
450	442	const qrs = QuickReplySet.from(JSON.parse(JSON.stringify(props)));
451	443	qrs.qrList = props.qrList.map(it => QuickReply.from(it));
452	444	qrs.init();
453	445	const oldQrs = QuickReplySet.get(props.name);
454	446	if (oldQrs) {

@@ -466,7 +458,7 @@ export class SettingsUi {
466	458	this.prepareCharacterSetList();
467	459	}
468	460	} else {
469	461	const idx = QuickReplySet.list.findIndex(it => it.name.toLowerCase().localeCompare(qrs.name.toLowerCase()) == 1);
470	462	if (idx > -1) {
471	463	QuickReplySet.list.splice(idx, 0, qrs);
472	464	} else {

@@ -496,7 +488,7 @@ export class SettingsUi {
496	488	}
497	489
498	490	exportQrSet() {
499	491	const blob = new Blob([JSON.stringify(this.currentQrSet)], { type: 'application/json' });
500	492	const url = URL.createObjectURL(blob);
501	493	const a = document.createElement('a'); {
502	494	a.href = url;

public/scripts/extensions/quick-reply/src/ui/ctx/ContextMenu.js+0 -4 Viewed

@@ -11,8 +11,6 @@ export class ContextMenu {
11	11	/**@type {HTMLElement}*/ menu;
12	12
13	13
14		-
15		-
16	14	constructor(/**@type {QuickReply}*/qr) {
17	15	// this.itemList = items;
18	16	this.itemList = this.build(qr).children;

@@ -104,8 +102,6 @@ export class ContextMenu {
104	102	}
105	103
106	104
107		-
108		-
109	105	show({ clientX, clientY }) {
110	106	if (this.isActive) return;
111	107	this.isActive = true;

public/scripts/extensions/quick-reply/src/ui/ctx/MenuItem.js+0 -3 Viewed

@@ -15,8 +15,6 @@ export class MenuItem {
15	15	/**@type {function}*/ onExpand;
16	16
17	17
18		-
19		-
20	18	/**
21	19	*
22	20	* @param {?string} icon

@@ -80,7 +78,6 @@ export class MenuItem {
80	78	}
81	79	item.addEventListener('mouseover', () => sub.show(item));
82	80	item.addEventListener('mouseleave', () => sub.hide());
83		-
84	81	}
85	82	}
86	83	}

public/scripts/extensions/quick-reply/src/ui/ctx/SubMenu.js+0 -4 Viewed

@@ -9,8 +9,6 @@ export class SubMenu {
9	9	/**@type {HTMLElement}*/ root;
10	10
11	11
12		-
13		-
14	12	constructor(/**@type {MenuItem[]}*/items) {
15	13	this.itemList = items;
16	14	}

@@ -29,8 +27,6 @@ export class SubMenu {
29	27	}
30	28
31	29
32		-
33		-
34	30	show(/**@type {HTMLElement}*/parent) {
35	31	if (this.isActive) return;
36	32	this.isActive = true;

public/scripts/extensions/regex/index.js+0 -1 Viewed

@@ -1031,7 +1031,6 @@ function executeRegexScriptForDebugging(script, text) {
1031	1031	const trailingText = text.substring(lastIndex);
1032	1032	outputText += trailingText;
1033	1033	highlightedOutput += escapeHtml(trailingText);
1034		-
1035	1034	} catch (e) {
1036	1035	err = (err ? err + '; ' : '') + `Replace error: ${e.message}`;
1037	1036	outputText = text; // Fallback

public/scripts/extensions/token-counter/index.js+0 -1 Viewed

@@ -115,5 +115,4 @@ jQuery(() => {
115	115	returns: 'number of tokens',
116	116	helpString: 'Counts the number of tokens in the current chat.',
117	117	}));
118		-
119	118	});

public/scripts/extensions/tts/alltalk.js+0 -1 Viewed

@@ -1043,7 +1043,6 @@ class AllTalkTtsProvider {
1043	1043	// V2: Combine the endpoint with the relative path
1044	1044	return `${this.settings.provider_endpoint}${data.output_file_url}`;
1045	1045	}
1046		-
1047	1046	} catch (error) {
1048	1047	console.error('[fetchTtsGeneration] Exception caught:', error);
1049	1048	throw error;

public/scripts/extensions/tts/chatterbox.js+0 -3 Viewed

@@ -239,7 +239,6 @@ class ChatterboxTtsProvider {
239	239	}
240	240
241	241	this.setupEventListeners();
242		-
243	242	} catch (error) {
244	243	console.error('Error loading Chatterbox settings:', error);
245	244	this.updateStatus('Offline');

@@ -518,7 +517,6 @@ class ChatterboxTtsProvider {
518	517	});
519	518
520	519	await audio.play();
521		-
522	520	} catch (error) {
523	521	console.error('Error previewing voice:', error);
524	522	this.updateStatus('Ready');

@@ -627,7 +625,6 @@ class ChatterboxTtsProvider {
627	625
628	626	// Return the response directly - SillyTavern expects a Response object
629	627	return response;
630		-
631	628	} catch (error) {
632	629	console.error('Error in generateTts:', error);
633	630	this.updateStatus('Ready');

public/scripts/extensions/tts/coqui.js+12 -13 Viewed

@@ -160,7 +160,7 @@ class CoquiTtsProvider {
160	160	.then(response => response.json())
161	161	.then(json => {
162	162	coquiApiModels = json;
163	163	console.debug(DEBUG_PREFIX, 'initialized coqui-api model list to', coquiApiModels);
164	164	/*
165	165	$('#coqui_api_language')
166	166	.find('option')

@@ -180,7 +180,7 @@ class CoquiTtsProvider {
180	180	.then(response => response.json())
181	181	.then(json => {
182	182	coquiApiModelsFull = json;
183	183	console.debug(DEBUG_PREFIX, 'initialized coqui-api full model list to', coquiApiModelsFull);
184	184	/*
185	185	$('#coqui_api_full_language')
186	186	.find('option')

@@ -197,7 +197,7 @@ class CoquiTtsProvider {
197	197	}
198	198
199	199	// Perform a simple readiness check by trying to fetch voiceIds
200	200	async checkReady() {
201	201	throwIfModuleMissing();
202	202	await this.fetchTtsVoiceObjects();
203	203	}

@@ -384,12 +384,12 @@ class CoquiTtsProvider {
384	384	.append('<option value="none">Select model language</option>')
385	385	.val('none');
386	386
387	387	for (let language in coquiApiModels) {
388	388	let languageLabel = language;
389	389	if (language in languageLabels)
390	390	languageLabel = languageLabels[language];
391	391	$('#coqui_api_language').append(new Option(languageLabel, language));
392	392	console.log(DEBUG_PREFIX, 'added language', languageLabel, '(', language, ')');
393	393	}
394	394
395	395	$('#coqui_api_model_div').show();

@@ -406,12 +406,12 @@ class CoquiTtsProvider {
406	406	.append('<option value="none">Select model language</option>')
407	407	.val('none');
408	408
409	409	for (let language in coquiApiModelsFull) {
410	410	let languageLabel = language;
411	411	if (language in languageLabels)
412	412	languageLabel = languageLabels[language];
413	413	$('#coqui_api_language').append(new Option(languageLabel, language));
414	414	console.log(DEBUG_PREFIX, 'added language', languageLabel, '(', language, ')');
415	415	}
416	416
417	417	$('#coqui_api_model_div').show();

@@ -450,8 +450,8 @@ class CoquiTtsProvider {
450	450	if (model_origin == 'coqui-api-full')
451	451	modelDict = coquiApiModelsFull;
452	452
453	453	for (let model_dataset in modelDict[model_language])
454	454	for (let model_name in modelDict[model_language][model_dataset]) {
455	455	const model_id = model_dataset + '/' + model_name;
456	456	const model_label = model_name + ' (' + model_dataset + ' dataset)';
457	457	$('#coqui_api_model_name').append(new Option(model_label, model_id));

@@ -526,7 +526,7 @@ class CoquiTtsProvider {
526	526
527	527	// Check if already installed and propose to do it otherwise
528	528	const model_id = modelDict[model_language][model_dataset][model_name].id;
529	529	console.debug(DEBUG_PREFIX, 'Check if model is already installed', model_id);
530	530	const result = await CoquiTtsProvider.checkmodel_state(model_id);
531	531	const resultJSON = await result.json();
532	532	const model_state = resultJSON.model_state;

@@ -583,7 +583,6 @@ class CoquiTtsProvider {
583	583	$('#coqui_api_model_install_button').show();
584	584	return;
585	585	}
586		-
587	586	}
588	587
589	588

public/scripts/extensions/tts/cosyvoice.js+0 -6 Viewed

@@ -110,15 +110,11 @@ class CosyVoiceProvider {
110	110	//#################//
111	111
112	112	async getVoice(voiceName) {
113		-
114		-
115		-
116	113	if (this.voices.length == 0) {
117	114	this.voices = await this.fetchTtsVoiceObjects();
118	115	}
119	116
120	117
121		-
122	118	const match = this.voices.filter(
123	119	v => v.name == voiceName,
124	120	)[0];

@@ -130,7 +126,6 @@ class CosyVoiceProvider {
130	126	}
131	127
132	128
133		-
134	129	async generateTts(text, voiceId) {
135	130	const response = await this.fetchTtsGeneration(text, voiceId);
136	131	return response;

@@ -198,7 +193,6 @@ class CosyVoiceProvider {
198	193	}
199	194
200	195
201		-
202	196	// Interface not used
203	197	async fetchTtsFromHistory(history_item_id) {
204	198	return Promise.resolve(history_item_id);

public/scripts/extensions/tts/elevenlabs.js+1 -1 Viewed

@@ -132,7 +132,7 @@ class ElevenLabsTtsProvider {
132	132	}
133	133
134	134	if (Object.hasOwn(settings, 'apiKey')) {
135	135	if (settings.apiKey && !secret_state[SECRET_KEYS.ELEVENLABS]) {
136	136	await writeSecret(SECRET_KEYS.ELEVENLABS, settings.apiKey);
137	137	}
138	138	delete settings.apiKey;

public/scripts/extensions/tts/google-native.js+0 -2 Viewed

@@ -124,7 +124,6 @@ export class GoogleNativeTtsProvider {
124	124	console.info(`Google TTS: Loaded ${this.voices.length} voices`);
125	125
126	126	return this.voices;
127		-
128	127	} catch (error) {
129	128	console.error('Failed to fetch Google TTS voices:', error);
130	129	throw error;

@@ -151,7 +150,6 @@ export class GoogleNativeTtsProvider {
151	150	this.audioElement.src = url;
152	151	this.audioElement.play();
153	152	this.audioElement.onended = () => URL.revokeObjectURL(url);
154		-
155	153	} catch (error) {
156	154	console.error('TTS Preview Error:', error);
157	155	toastr.error(`Could not generate preview: ${error.message}`);

public/scripts/extensions/tts/gpt-sovits-v2.js+0 -8 Viewed

@@ -115,15 +115,11 @@ class GptSovitsV2Provider {
115	115	//#################//
116	116
117	117	async getVoice(voiceName) {
118		-
119		-
120		-
121	118	if (this.voices.length == 0) {
122	119	this.voices = await this.fetchTtsVoiceObjects();
123	120	}
124	121
125	122
126		-
127	123	const match = this.voices.filter(
128	124	v => v.name == voiceName,
129	125	)[0];

@@ -135,7 +131,6 @@ class GptSovitsV2Provider {
135	131	}
136	132
137	133
138		-
139	134	async generateTts(text, voiceId) {
140	135	const response = await this.fetchTtsGeneration(text, voiceId);
141	136	return response;

@@ -171,8 +166,6 @@ class GptSovitsV2Provider {
171	166	*/
172	167
173	168
174		-
175		-
176	169	async fetchTtsGeneration(inputText, voiceId, lang = null, forceNoStreaming = false) {
177	170	console.info(`Generating new TTS for voice_id ${voiceId}`);
178	171

@@ -215,7 +208,6 @@ class GptSovitsV2Provider {
215	208	}
216	209
217	210
218		-
219	211	// Interface not used
220	212	async fetchTtsFromHistory(history_item_id) {
221	213	return Promise.resolve(history_item_id);

public/scripts/extensions/tts/gsvi.js+0 -9 Viewed

@@ -1,4 +1,3 @@
1		-
2	1	import { saveTtsProviderSettings } from './index.js';
3	2
4	3	export { GSVITtsProvider };

@@ -60,11 +59,9 @@ class GSVITtsProvider {
60	59	const characterList = await response.json();
61	60	this.characterList = characterList;
62	61	this.voices = Object.keys(characterList);
63		-
64	62	}
65	63
66	64
67		-
68	65	get settingsHtml() {
69	66	let html = `
70	67	<label for="gsvi_api_language">Text Language</label>

@@ -142,11 +139,8 @@ class GSVITtsProvider {
142	139	$('#gsvi_batch_size_output').text(this.settings.batch_size);
143	140
144	141
145		-
146		-
147	142	// Persist settings changes
148	143	saveTtsProviderSettings();
149		-
150	144	}
151	145
152	146	async loadSettings(settings) {

@@ -197,7 +191,6 @@ class GSVITtsProvider {
197	191	}
198	192
199	193
200		-
201	194	// Perform a simple readiness check by trying to fetch voiceIds
202	195	async checkReady() {
203	196	await Promise.allSettled([this.fetchCharacterList()]);

@@ -256,12 +249,10 @@ class GSVITtsProvider {
256	249
257	250
258	251	return `${this.settings.provider_endpoint}/tts?${params.toString()}`;
259		-
260	252	}
261	253
262	254	// Interface not used by GSVI TTS
263	255	async fetchTtsFromHistory(history_item_id) {
264	256	return Promise.resolve(history_item_id);
265	257	}
266		-
267	258	}

public/scripts/extensions/tts/index.js+0 -4 Viewed

@@ -611,7 +611,6 @@ async function processTtsQueue() {
611	611
612	612	// Pass the full voiceMapKey (e.g., "User ("Quotes")") as well with character name
613	613	await tts(segmentText, voiceId, char, voiceMapKey);
614		-
615	614	} catch (error) {
616	615	toastr.error(error.toString());
617	616	console.error(error);

@@ -707,7 +706,6 @@ async function processTtsQueue() {
707	706
708	707	// Clear current job so the segmented jobs can be processed
709	708	currentTtsJob = null;
710		-
711	709	} catch (error) {
712	710	toastr.error(error.toString());
713	711	console.error(error);

@@ -1286,7 +1284,6 @@ export function getCharacters(unrestricted) {
1286	1284	}
1287	1285
1288	1286	return characters;
1289		-
1290	1287	}
1291	1288
1292	1289	export function sanitizeId(input) {

@@ -1314,7 +1311,6 @@ function parseVoiceMap(voiceMapString) {
1314	1311	}
1315	1312
1316	1313
1317		-
1318	1314	/**
1319	1315	* Apply voiceMap based on current voiceMapEntries
1320	1316	*/

public/scripts/extensions/tts/kokoro-worker.js+1 -1 Viewed

@@ -7,7 +7,7 @@ let ready = false;
7	7	let voices = [];
8	8
9	9	// Handle messages from the main thread
10	10	self.onmessage = async function (e) {
11	11	const { action, data } = e.data;
12	12
13	13	switch (action) {

public/scripts/extensions/tts/minimax.js+0 -2 Viewed

@@ -837,7 +837,6 @@ class MiniMaxTtsProvider {
837	837	// Backend handles all the complex processing and returns audio data directly
838	838	console.debug('MiniMax TTS: Audio response received from backend');
839	839	return response;
840		-
841	840	} catch (error) {
842	841	console.error('Error in MiniMax TTS generation:', error);
843	842	throw error;

@@ -954,7 +953,6 @@ class MiniMaxTtsProvider {
954	953	this.audioElement.onended = null;
955	954	this.audioElement.onerror = null;
956	955	};
957		-
958	956	} catch (error) {
959	957	console.error('MiniMax TTS Preview Error:', error);
960	958	toastr.error(`Could not generate preview: ${error.message}`);

public/scripts/extensions/tts/openai.js+0 -1 Viewed

@@ -146,7 +146,6 @@ class OpenAITtsProvider {
146	146	}
147	147
148	148	populateCharacterInstructions() {
149		-
150	149	const currentCharacters = $('.tts_voicemap_block_char span').map((i, el) => $(el).text()).get();
151	150
152	151	$('#openai-character-instructions').empty();

public/scripts/extensions/tts/silerotts.js+0 -1 Viewed

@@ -172,5 +172,4 @@ class SileroTtsProvider {
172	172	async fetchTtsFromHistory(history_item_id) {
173	173	return Promise.resolve(history_item_id);
174	174	}
175		-
176	175	}

public/scripts/extensions/tts/xtts.js+0 -1 Viewed

@@ -323,5 +323,4 @@ class XTTSTtsProvider {
323	323	async fetchTtsFromHistory(history_item_id) {
324	324	return Promise.resolve(history_item_id);
325	325	}
326		-
327	326	}

public/scripts/extensions/vectors/index.js+0 -1 Viewed

@@ -1456,7 +1456,6 @@ async function onViewStatsClick() {
1456	1456	messageElement.addClass('vectorized');
1457	1457	}
1458	1458	}
1459		-
1460	1459	}
1461	1460
1462	1461	async function onVectorizeAllFilesClick() {

public/scripts/f-localStorage.js+0 -1 Viewed

@@ -13,7 +13,6 @@ export function SaveLocal(target, val) {
13	13	export function LoadLocal(target) {
14	14	console.debug('LoadLocal -- ' + target);
15	15	return localStorage.getItem(target);
16		-
17	16	}
18	17	/**
19	18	* @deprecated THIS FUNCTION IS OBSOLETE. DO NOT USE

public/scripts/filters.js+0 -1 Viewed

@@ -76,7 +76,6 @@ export const fuzzySearchCategories = Object.freeze({
76	76	* data = filterHelper.applyFilters(data);
77	77	*/
78	78	export class FilterHelper {
79		-
80	79	/**
81	80	* Cache fuzzy search weighting scores for re-usability, sorting and stuff
82	81	*

public/scripts/group-chats.js+0 -1 Viewed

@@ -2477,7 +2477,6 @@ jQuery(() => {
2477	2477	const value = $(this).prop('checked');
2478	2478	hideMutedSprites = value;
2479	2479	onHideMutedSpritesClick(value);
2480		-
2481	2480	});
2482	2481	$('#send_textarea').on('keyup', onSendTextareaInput);
2483	2482	$('#groupCurrentMemberPopoutButton').on('click', doCurMemberListPopout);

public/scripts/input-md-formatting.js+4 -5 Viewed

@@ -59,7 +59,8 @@ export function initInputMarkdown() {
59	59	let cursorShift = charsToAdd.length;
60	60	let selectedTextandPossibleFormatting = textarea.value.substring(start - possiblePreviousFormattingMargin, end + possiblePreviousFormattingMargin).trim();
61	61
62	62	if (isTextSelected) { //if text is selected
	63	+ //if text is selected
63	64	selectedText = textarea.value.substring(start, end);
64	65	if (selectedTextandPossibleFormatting === charsToAdd + selectedText + charsToAdd) {
65	66	// If the selected text is already formatted, remove the formatting

@@ -90,7 +91,8 @@ export function initInputMarkdown() {
90	91	textarea.focus();
91	92	document.execCommand('insertText', false, charsToAdd + selectedText + charsToAdd + possibleAddedSpace);
92	93	}
93	94	} else {// No text is selected
	95	+ // No text is selected
94	96	//check 1 character before and after the cursor for non-space characters
95	97
96	98	if (beforeCaret !== ' ' && afterCaret !== ' ' && afterCaret !== '' && beforeCaret !== '') { //look for caret in the middle of a word

@@ -116,7 +118,6 @@ export function initInputMarkdown() {
116	118	}
117	119
118	120	if (charsToAdd + discoveredWord + charsToAdd === discoveredWordWithPossibleFormatting) {
119		-
120	121	// Replace the expanded selection with the original discovered word
121	122	textarea.focus();
122	123	document.execCommand('insertText', false, discoveredWord);

@@ -126,8 +127,6 @@ export function initInputMarkdown() {
126	127	textarea.focus();
127	128	document.execCommand('insertText', false, charsToAdd + discoveredWord + charsToAdd);
128	129	}
129		-
130		-
131	130	} else { //caret is not inside a word, so just add the formatting
132	131	textarea.focus();
133	132	textarea.setSelectionRange(start, end);

public/scripts/instruct-mode.js+0 -1 Viewed

@@ -798,7 +798,6 @@ jQuery(() => {
798	798	$('#instruct_system_sequence').prop('readOnly', false);
799	799	$('#instruct_system_suffix').prop('readOnly', false);
800	800	}
801		-
802	801	});
803	802
804	803	$('#instruct_enabled').on('change', function () {

public/scripts/openai.js+0 -4 Viewed

@@ -2279,7 +2279,6 @@ function appendElectronHubOptions(model_list, groupModels = false) {
2279	2279	appendOption(model);
2280	2280	});
2281	2281	}
2282		-
2283	2282	}
2284	2283
2285	2284	function electronHubSortBy(data, property = 'alphabetically') {

@@ -3985,7 +3984,6 @@ function loadOpenAISettings(data, settings) {
3985	3984	option.value = i;
3986	3985	option.text = item;
3987	3986	$('#settings_preset_openai').append(option);
3988		-
3989	3987	});
3990	3988	openai_setting_names = settingNames;
3991	3989

@@ -4896,7 +4894,6 @@ function getSiliconflowMaxContext(model, isUnlocked) {
4896	4894
4897	4895	// Return context size if model found, otherwise default to 32k
4898	4896	return Object.entries(contextMap).find(([key]) => model.includes(key))?.[1] || max_32k;
4899		-
4900	4897	}
4901	4898
4902	4899	/**

@@ -5041,7 +5038,6 @@ async function onModelChange() {
5041	5038	console.log('Claude model changed to', value);
5042	5039	oai_settings.claude_model = value;
5043	5040	$('#model_claude_select').val(oai_settings.claude_model);
5044		-
5045	5041	}
5046	5042
5047	5043	if ($(this).is('#model_openai_select')) {

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

@@ -1593,7 +1593,6 @@ export async function showCharConnections() {
1593	1593	highlightPersonas: true,
1594	1594	targetedChar: getCurrentConnectionObj(),
1595	1595	shiftClickHandler: (element, ev) => {
1596		-
1597	1596	const personaId = $(element).attr('data-pid');
1598	1597
1599	1598	/** @type {PersonaConnection[]} */

@@ -1845,7 +1844,6 @@ async function lockPersonaCallback(_args, value) {
1845	1844	if (isFalseBoolean(value)) {
1846	1845	await setPersonaLockState(false, type);
1847	1846	return 'false';
1848		-
1849	1847	}
1850	1848
1851	1849	return '';

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

@@ -478,7 +478,6 @@ export class Popup {
478	478	break;
479	479	}
480	480	}
481		-
482	481	};
483	482	this.dlg.addEventListener('keydown', keyListener.bind(this));
484	483	}

public/scripts/power-user.js+1 -8 Viewed

@@ -536,7 +536,6 @@ function switchSwipeNumAllMessages() {
536	536	var originalSliderValues = [];
537	537
538	538	async function switchLabMode({ noReset = false } = {}) {
539		-
540	539	/* if (power_user.enableZenSliders && power_user.enableLabMode) {
541	540	toastr.warning("Can't start Lab Mode while Zen Sliders are active")
542	541	return

@@ -571,8 +570,6 @@ async function switchLabMode({ noReset = false } = {}) {
571	570	$('#amount_gen').attr('min', '1')
572	571	.attr('max', '99999')
573	572	.attr('step', '1');
574		-
575		-
576	573	} else if (!noReset) {
577	574	//re apply the original sliders values to each input
578	575	originalSliderValues.forEach(function (slider) {

@@ -628,7 +625,6 @@ async function switchZenSliders() {
628	625	});
629	626	$('div[id$="_zenslider"]').remove();
630	627	}
631		-
632	628	}
633	629	async function CreateZenSliders(elmnt) {
634	630	var originalSlider = elmnt;

@@ -1178,7 +1174,6 @@ function applyShadowWidth() {
1178	1174	document.documentElement.style.setProperty('--shadowWidth', String(power_user.shadow_width));
1179	1175	$('#shadow_width_counter').val(power_user.shadow_width);
1180	1176	$('#shadow_width').val(power_user.shadow_width);
1181		-
1182	1177	}
1183	1178
1184	1179	function applyFontScale(type) {

@@ -2954,7 +2949,6 @@ function setAvgBG() {
2954	2949	} */
2955	2950
2956	2951	function getAverageRGB(imgEl) {
2957		-
2958	2952	var blockSize = 5, // only visit every 5 pixels
2959	2953	defaultRGB = { r: 0, g: 0, b: 0 }, // for non-supporting envs
2960	2954	canvas = document.createElement('canvas'),

@@ -2994,7 +2988,6 @@ function setAvgBG() {
2994	2988	rgb.b = ~~(rgb.b / count);
2995	2989
2996	2990	return rgb;
2997		-
2998	2991	}
2999	2992
3000	2993	/**

@@ -4035,7 +4028,7 @@ jQuery(() => {
4035	4028	return;
4036	4029	}
4037	4030
4038	4031	eventSource.once(event_types.SETTINGS_UPDATED, function () {
4039	4032	toastr.warning(
4040	4033	t`Click here to reload.`,
4041	4034	t`Toggling the Experimental Macro Engine requires a reload.`,

public/scripts/preset-manager.js+0 -1 Viewed

@@ -514,7 +514,6 @@ class PresetManager {
514	514	console.error('Preset could not be renamed', error);
515	515	throw new Error('Preset could not be renamed');
516	516	}
517		-
518	517	}
519	518
520	519	/**

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

@@ -865,7 +865,6 @@ function selectReasoningTemplateCallback(args, name) {
865	865	UI.$select.val(foundName).trigger('change');
866	866	!quiet && toastr.success(`Reasoning template "${foundName}" selected`);
867	867	return foundName;
868		-
869	868	}
870	869
871	870	function registerReasoningSlashCommands() {

public/scripts/samplerSelect.js+0 -1 Viewed

@@ -203,7 +203,6 @@ function setSamplerListListeners() {
203	203
204	204	console.log(samplerName, relatedDOMElement.data(SELECT_SAMPLER.DATA), shouldDisplay);
205	205	});
206		-
207	206	}
208	207
209	208	function isElementVisibleInDOM(element) {

public/scripts/showdown-underscore.js+1 -1 Viewed

@@ -9,7 +9,7 @@ export const markdownUnderscoreExt = () => {
9	9	return [{
10	10	type: 'output',
11	11	regex: new RegExp('(<code(?:\\s+[^>]*)?>[\\s\\S]*?<\\/code>|<style(?:\\s+[^>]*)?>[\\s\\S]*?<\\/style>)|\\b(?<!_)_(?!_)(.*?)(?<!_)_(?!_)\\b', 'gi'),
12	12	replace: function (match, tagContent, italicContent) {
13	13	if (tagContent) {
14	14	// If it's inside <code> or <style> tags, return unchanged
15	15	return match;

public/scripts/slash-commands.js+0 -2 Viewed

@@ -4916,7 +4916,6 @@ export async function sendNarratorMessage(args, text) {
4916	4916	}
4917	4917
4918	4918	export async function promptQuietForLoudResponse(who, text) {
4919		-
4920	4919	let character_id = getContext().characterId;
4921	4920	if (who === 'sys') {
4922	4921	text = 'System: ' + text;

@@ -4955,7 +4954,6 @@ export async function promptQuietForLoudResponse(who, text) {
4955	4954	addOneMessage(message);
4956	4955	await eventSource.emit(event_types.USER_MESSAGE_RENDERED, (chat.length - 1));
4957	4956	await saveChatConditional();
4958		-
4959	4957	}
4960	4958
4961	4959	async function sendCommentMessage(args, text) {

public/scripts/slash-commands/SlashCommand.js+3 -6 Viewed

@@ -26,7 +26,6 @@ import { SlashCommandScope } from './SlashCommandScope.js';
26	26	*/
27	27
28	28
29		-
30	29	export class SlashCommand {
31	30	/**
32	31	* Creates a SlashCommand from a properties object.

@@ -48,8 +47,6 @@ export class SlashCommand {
48	47	}
49	48
50	49
51		-
52		-
53	50	/**@type {string}*/ name;
54	51	/**@type {(namedArguments:NamedArguments, unnamedArguments:UnnamedArguments)=>string|SlashCommandClosure|Promise<string|SlashCommandClosure>}*/ callback;
55	52	/**@type {string}*/ helpString;

@@ -86,7 +83,7 @@ export class SlashCommand {
86	83	name.classList.add('name');
87	84	name.classList.add('monospace');
88	85	name.textContent = '/';
89	86	key.split('').forEach(char => {
90	87	const span = document.createElement('span'); {
91	88	span.textContent = char;
92	89	name.append(span);

@@ -229,7 +226,7 @@ export class SlashCommand {
229	226	const unnamedArguments = cmd.unnamedArgumentList ?? [];
230	227	const returnType = cmd.returns ?? 'void';
231	228	const helpString = cmd.helpString ?? 'NO DETAILS';
232	229	const aliasList = [cmd.name, ...(cmd.aliases ?? [])].filter(it => it != key);
233	230	const specs = document.createElement('div'); {
234	231	specs.classList.add('specs');
235	232	const head = document.createElement('div'); {

@@ -257,7 +254,7 @@ export class SlashCommand {
257	254	this.isExtension ? 'Extension' : 'Core',
258	255	this.isThirdParty ? 'Third Party' : (this.isExtension ? 'Core' : null),
259	256	this.source,
260	257	].filter(it => it).join('\n');
261	258	head.append(src);
262	259	}
263	260	if (this.rawQuotes) {

public/scripts/slash-commands/SlashCommandArgument.js+1 -2 Viewed

@@ -5,7 +5,6 @@ import { SlashCommandExecutor } from './SlashCommandExecutor.js';
5	5	import { SlashCommandScope } from './SlashCommandScope.js';
6	6
7	7
8		-
9	8	/**@readonly*/
10	9	/**@enum {string}*/
11	10	export const ARGUMENT_TYPE = {

@@ -68,7 +67,7 @@ export class SlashCommandArgument {
68	67	this.isRequired = isRequired ?? false;
69	68	this.acceptsMultiple = acceptsMultiple ?? false;
70	69	this.defaultValue = defaultValue;
71	70	this.enumList = (enums ? Array.isArray(enums) ? enums : [enums] : []).map(it => {
72	71	if (it instanceof SlashCommandEnumValue) return it;
73	72	return new SlashCommandEnumValue(it);
74	73	});

public/scripts/slash-commands/SlashCommandAutoCompleteNameResult.js+13 -13 Viewed

@@ -22,11 +22,11 @@ export class SlashCommandAutoCompleteNameResult extends AutoCompleteNameResult {
22	22	executor.start,
23	23	Object
24	24	.keys(commands)
25	25	.map(key => new SlashCommandCommandAutoCompleteOption(commands[key], key))
26	26	,
27	27	false,
28	28	() => `No matching slash commands for "/${this.name}"`,
29	29	() => 'No slash commands found!',
30	30	);
31	31	this.executor = executor;
32	32	this.scope = scope;

@@ -63,7 +63,7 @@ export class SlashCommandAutoCompleteNameResult extends AutoCompleteNameResult {
63	63	if (!Array.isArray(this.executor.command?.namedArgumentList)) {
64	64	return null;
65	65	}
66	66	const notProvidedNamedArguments = this.executor.command.namedArgumentList.filter(arg => !this.executor.namedArgumentList.find(it => it.name == arg.name));
67	67	let name;
68	68	let value;
69	69	let start;

@@ -73,13 +73,13 @@ export class SlashCommandAutoCompleteNameResult extends AutoCompleteNameResult {
73	73	const namedArgsFollowedBySpace = text[this.executor.endNamedArgs] == ' ';
74	74	if (this.executor.startNamedArgs <= index && this.executor.endNamedArgs + (namedArgsFollowedBySpace ? 1 : 0) >= index) {
75	75	// cursor is somewhere within the named arguments (including final space)
76	76	argAssign = this.executor.namedArgumentList.find(it => it.start <= index && it.end >= index);
77	77	if (argAssign) {
78	78	const [argName, ...v] = text.slice(argAssign.start, index).split(getSplitRegex());
79	79	name = argName;
80	80	value = v.join('');
81	81	start = argAssign.start;
82	82	cmdArg = this.executor.command.namedArgumentList.find(it => [it.name, `${it.name}=`].includes(argAssign.name));
83	83	if (cmdArg) notProvidedNamedArguments.push(cmdArg);
84	84	} else {
85	85	name = '';

@@ -106,13 +106,13 @@ export class SlashCommandAutoCompleteNameResult extends AutoCompleteNameResult {
106	106	// if cursor is already behind "=" check for enums
107	107	const enumList = cmdArg?.enumProvider?.(this.executor, this.scope) ?? cmdArg?.enumList;
108	108	if (cmdArg && enumList?.length) {
109	109	if (isSelect && enumList.find(it => it.value == value) && argAssign && argAssign.end == index) {
110	110	return null;
111	111	}
112	112	const result = new AutoCompleteSecondaryNameResult(
113	113	value,
114	114	start + name.length,
115	115	enumList.map(it => SlashCommandEnumAutoCompleteOption.from(this.executor.command, it)),
116	116	true,
117	117	);
118	118	result.isRequired = true;

@@ -125,10 +125,10 @@ export class SlashCommandAutoCompleteNameResult extends AutoCompleteNameResult {
125	125	const result = new AutoCompleteSecondaryNameResult(
126	126	name,
127	127	start,
128	128	notProvidedNamedArguments.map(it => new SlashCommandNamedArgumentAutoCompleteOption(it, this.executor.command)),
129	129	false,
130	130	);
131	131	result.isRequired = notProvidedNamedArguments.find(it => it.isRequired) != null;
132	132	return result;
133	133	}
134	134

@@ -147,7 +147,7 @@ export class SlashCommandAutoCompleteNameResult extends AutoCompleteNameResult {
147	147	let argAssign;
148	148	if (this.executor.startUnnamedArgs <= index && this.executor.endUnnamedArgs + 1 >= index) {
149	149	// cursor is somwehere in the unnamed args
150	150	const idx = this.executor.unnamedArgumentList.findIndex(it => it.start <= index && it.end >= index);
151	151	if (idx > -1) {
152	152	argAssign = this.executor.unnamedArgumentList[idx];
153	153	cmdArg = this.executor.command.unnamedArgumentList[idx];

@@ -179,10 +179,10 @@ export class SlashCommandAutoCompleteNameResult extends AutoCompleteNameResult {
179	179	const result = new AutoCompleteSecondaryNameResult(
180	180	value,
181	181	start,
182	182	enumList.map(it => SlashCommandEnumAutoCompleteOption.from(this.executor.command, it)),
183	183	false,
184	184	);
185	185	const isCompleteValue = enumList.find(it => it.value == value);
186	186	const isSelectedValue = isSelect && isCompleteValue;
187	187	result.isRequired = cmdArg.isRequired && !isSelectedValue;
188	188	result.forceMatch = cmdArg.forceEnum;

public/scripts/slash-commands/SlashCommandBrowser.js+15 -15 Viewed

@@ -25,7 +25,7 @@ export class SlashCommandBrowser {
25	25	inp.classList.add('text_pole');
26	26	inp.type = 'search';
27	27	inp.placeholder = 'Search slash commands - use quotes to search "literal" instead of fuzzy';
28	28	inp.addEventListener('input', () => {
29	29	this.details?.remove();
30	30	this.details = null;
31	31	let query = inp.value.trim();

@@ -38,7 +38,7 @@ export class SlashCommandBrowser {
38	38	const match = queryRegex.exec(query);
39	39	if (!match) break;
40	40	if (match[1] !== undefined) {
41	41	fuzzyList.push(new RegExp(`^(.*?)${match[1].split('').map(char => `(${escapeRegex(char)})`).join('(.*?)')}(.*?)$`, 'i'));
42	42	} else if (match[2] !== undefined) {
43	43	quotedList.push(match[2]);
44	44	}

@@ -47,17 +47,17 @@ export class SlashCommandBrowser {
47	47	for (const cmd of this.cmdList) {
48	48	const targets = [
49	49	cmd.name,
50	50	...cmd.namedArgumentList.map(it => it.name),
51	51	...cmd.namedArgumentList.map(it => it.description),
52	52	...cmd.namedArgumentList.map(it => it.enumList.map(e => e.value)).flat(),
53	53	...cmd.namedArgumentList.map(it => it.typeList).flat(),
54	54	...cmd.unnamedArgumentList.map(it => it.description),
55	55	...cmd.unnamedArgumentList.map(it => it.enumList.map(e => e.value)).flat(),
56	56	...cmd.unnamedArgumentList.map(it => it.typeList).flat(),
57	57	...cmd.aliases,
58	58	cmd.helpString,
59	59	];
60	60	const find = () => targets.find(t => (fuzzyList.find(f => f.test(t)) ?? quotedList.find(q => t.includes(q))) !== undefined) !== undefined;
61	61	if (fuzzyList.length + quotedList.length === 0 || find()) {
62	62	this.itemMap[cmd.name].classList.remove('isFiltered');
63	63	} else {

@@ -85,7 +85,7 @@ export class SlashCommandBrowser {
85	85	const item = cmd.renderHelpItem();
86	86	this.itemMap[cmd.name] = item;
87	87	let details;
88	88	item.addEventListener('click', () => {
89	89	if (!details) {
90	90	details = document.createElement('div'); {
91	91	details.classList.add('autoComplete-detailsWrap');

@@ -97,7 +97,7 @@ export class SlashCommandBrowser {
97	97	}
98	98	}
99	99	if (this.details !== details) {
100	100	Array.from(list.querySelectorAll('.selected')).forEach(it => it.classList.remove('selected'));
101	101	item.classList.add('selected');
102	102	this.details?.remove();
103	103	container.append(details);

@@ -122,13 +122,13 @@ export class SlashCommandBrowser {
122	122	}
123	123	parent.append(this.dom);
124	124
125	125	this.mo = new MutationObserver(muts => {
126	126	if (muts.find(mut => Array.from(mut.removedNodes).find(it => it === this.dom || it.contains(this.dom)))) {
127	127	this.mo.disconnect();
128	128	window.removeEventListener('keydown', boundHandler);
129	129	}
130	130	});
131	131	this.mo.observe(document.querySelector('#chat'), { childList: true, subtree: true });
132	132	const boundHandler = this.handleKeyDown.bind(this);
133	133	window.addEventListener('keydown', boundHandler);
134	134	return this.dom;

public/scripts/slash-commands/SlashCommandClosure.js+17 -17 Viewed

@@ -37,7 +37,7 @@ export class SlashCommandClosure {
37	37
38	38	/**@type {number}*/
39	39	get commandCount() {
40	40	return this.executorList.map(executor => executor.commandCount).reduce((sum, cur) => sum + cur, 0);
41	41	}
42	42
43	43	constructor(parent) {

@@ -156,7 +156,7 @@ export class SlashCommandClosure {
156	156	let isList = false;
157	157	let listValues = [];
158	158	scope = scope ?? this.scope;
159	159	const escapeMacro = (it, isAnchored = false) => {
160	160	const regexText = escapeRegex(it.key.replace(/\*/g, '~~~WILDCARD~~~'))
161	161	.replaceAll('~~~WILDCARD~~~', '(?:(?:(?!(?:::|}})).)*)')
162	162	;

@@ -165,7 +165,7 @@ export class SlashCommandClosure {
165	165	}
166	166	return regexText;
167	167	};
168	168	const macroList = scope.macroList.toSorted((a, b) => {
169	169	if (a.key.includes('*') && !b.key.includes('*')) return 1;
170	170	if (!a.key.includes('*') && b.key.includes('*')) return -1;
171	171	if (a.key.includes('*') && b.key.includes('*')) return b.key.indexOf('*') - a.key.indexOf('*');

@@ -174,7 +174,7 @@ export class SlashCommandClosure {
174	174	if (power_user.experimental_macro_engine) {
175	175	return this.substituteWithMacroEngine(text, scope, macroList);
176	176	}
177	177	const macros = macroList.map(it => escapeMacro(it)).join('|');
178	178	const re = new RegExp(`(?<pipe>{{pipe}})|(?:{{var::(?<var>[^\\s]+?)(?:::(?<varIndex>(?!}}).+))?}})|(?:{{(?<macro>${macros})}})`);
179	179	let done = '';
180	180	let remaining = text;

@@ -182,7 +182,7 @@ export class SlashCommandClosure {
182	182	const match = re.exec(remaining);
183	183	const before = substituteParams(remaining.slice(0, match.index));
184	184	const after = remaining.slice(match.index + match[0].length);
185	185	const replacer = match.groups.pipe ? scope.pipe : match.groups.var ? scope.getVariable(match.groups.var, match.groups.index) : macroList.find(it => it.key == match.groups.macro || new RegExp(escapeMacro(it, true)).test(match.groups.macro))?.value;
186	186	if (replacer instanceof SlashCommandClosure) {
187	187	replacer.abortController = this.abortController;
188	188	replacer.breakController = this.breakController;

@@ -253,7 +253,7 @@ export class SlashCommandClosure {
253	253	return step.value;
254	254	}
255	255
256	256	async * executeDirect() {
257	257	this.debugController?.down(this);
258	258	// closure arguments
259	259	for (const arg of this.argumentList) {

@@ -325,10 +325,10 @@ export class SlashCommandClosure {
325	325	// breakpoint has to yield before arguments are resolved if one of the
326	326	// arguments is an immediate closure, otherwise you cannot step into the
327	327	// immediate closure
328	328	const hasImmediateClosureInNamedArgs = /**@type {SlashCommandExecutor}*/(step.value)?.namedArgumentList?.find(it => it.value instanceof SlashCommandClosure && it.value.executeNow);
329	329	const hasImmediateClosureInUnnamedArgs = /**@type {SlashCommandExecutor}*/(step.value)?.unnamedArgumentList?.find(it => it.value instanceof SlashCommandClosure && it.value.executeNow);
330	330	if (hasImmediateClosureInNamedArgs || hasImmediateClosureInUnnamedArgs) {
331	331	this.debugController.isStepping = yield { closure: this, executor: step.value };
332	332	} else {
333	333	this.debugController.isStepping = true;
334	334	this.debugController.stepStack[this.debugController.stepStack.length - 1] = true;

@@ -338,10 +338,10 @@ export class SlashCommandClosure {
338	338	this.debugController.isSteppingInto = false;
339	339	// if stepping, have to yield before arguments are resolved if one of the arguments
340	340	// is an immediate closure, otherwise you cannot step into the immediate closure
341	341	const hasImmediateClosureInNamedArgs = /**@type {SlashCommandExecutor}*/(step.value)?.namedArgumentList?.find(it => it.value instanceof SlashCommandClosure && it.value.executeNow);
342	342	const hasImmediateClosureInUnnamedArgs = /**@type {SlashCommandExecutor}*/(step.value)?.unnamedArgumentList?.find(it => it.value instanceof SlashCommandClosure && it.value.executeNow);
343	343	if (hasImmediateClosureInNamedArgs || hasImmediateClosureInUnnamedArgs) {
344	344	this.debugController.isStepping = yield { closure: this, executor: step.value };
345	345	}
346	346	}
347	347	// resolve args

@@ -354,7 +354,7 @@ export class SlashCommandClosure {
354	354	}
355	355	} else if (!step.done && this.debugController?.testStepping(this)) {
356	356	this.debugController.isSteppingInto = false;
357	357	this.debugController.isStepping = yield { closure: this, executor: step.value };
358	358	}
359	359	// execute executor
360	360	step = await stepper.next();

@@ -377,7 +377,7 @@ export class SlashCommandClosure {
377	377	* - after arguments are resolved
378	378	* - after execution
379	379	*/
380	380	async * executeStep() {
381	381	let done = 0;
382	382	let isFirst = true;
383	383	for (const executor of this.executorList) {

@@ -429,7 +429,7 @@ export class SlashCommandClosure {
429	429	// then yield for "before exec"
430	430	yield executor;
431	431	// followed by command execution
432	432	executor.onProgress = (subDone, subTotal) => this.onProgress?.(done + subDone, this.commandCount);
433	433	const isStepping = this.debugController?.testStepping(this);
434	434	if (this.debugController) {
435	435	this.debugController.isStepping = false || this.debugController.isSteppingInto;

@@ -586,7 +586,7 @@ export class SlashCommandClosure {
586	586	if (!executor.command.splitUnnamedArgument) {
587	587	if (value.length == 1) {
588	588	value = value[0];
589	589	} else if (!value.find(it => it instanceof SlashCommandClosure)) {
590	590	value = value.join('');
591	591	}
592	592	}

@@ -598,7 +598,7 @@ export class SlashCommandClosure {
598	598	?.replace(/\\\}/g, '}')
599	599	;
600	600	} else if (Array.isArray(value)) {
601	601	value = value.map(v => {
602	602	if (typeof v == 'string') {
603	603	return v
604	604	?.replace(/\\\{/g, '{')

public/scripts/slash-commands/SlashCommandCommandAutoCompleteOption.js+0 -2 Viewed

@@ -10,8 +10,6 @@ export class SlashCommandCommandAutoCompleteOption extends AutoCompleteOption {
10	10	}
11	11
12	12
13		-
14		-
15	13	/**
16	14	* @param {SlashCommand} command
17	15	* @param {string} name

public/scripts/slash-commands/SlashCommandCommonEnumsProvider.js+1 -1 Viewed

@@ -155,7 +155,7 @@ export const commonEnumProviders = {
155	155	...isAll || types.includes('scope') ? scope.allVariableNames.map(name => new SlashCommandEnumValue(name, null, enumTypes.variable, enumIcons.scopeVariable)) : [],
156	156	...isAll || types.includes('local') ? Object.keys(chat_metadata.variables ?? []).map(name => new SlashCommandEnumValue(name, null, enumTypes.name, enumIcons.localVariable)) : [],
157	157	...isAll || types.includes('global') ? Object.keys(extension_settings.variables.global ?? []).map(name => new SlashCommandEnumValue(name, null, enumTypes.macro, enumIcons.globalVariable)) : [],
158	158	].filter((item, idx, list) => idx == list.findIndex(it => it.value == item.value));
159	159	},
160	160
161	161	/**

public/scripts/slash-commands/SlashCommandDebugController.js+4 -9 Viewed

@@ -18,15 +18,11 @@ export class SlashCommandDebugController {
18	18	/** @type {(closure:SlashCommandClosure, executor:SlashCommandExecutor)=>Promise<boolean>} */ onBreakPoint;
19	19
20	20
21		-
22		-
23	21	testStepping(closure) {
24	22	return this.stepStack[this.stack.indexOf(closure)];
25	23	}
26	24
27	25
28		-
29		-
30	26	down(closure) {
31	27	this.stack.push(closure);
32	28	if (this.stepStack.length < this.stack.length) {

@@ -44,20 +40,19 @@ export class SlashCommandDebugController {
44	40	}
45	41
46	42
47		-
48	43	resume() {
49	44	this.continueResolver?.(false);
50	45	this.continuePromise = null;
51	46	this.stepStack.forEach((_, idx) => this.stepStack[idx] = false);
52	47	}
53	48	step() {
54	49	this.stepStack.forEach((_, idx) => this.stepStack[idx] = true);
55	50	this.continueResolver?.(true);
56	51	this.continuePromise = null;
57	52	}
58	53	stepInto() {
59	54	this.isSteppingInto = true;
60	55	this.stepStack.forEach((_, idx) => this.stepStack[idx] = true);
61	56	this.continueResolver?.(true);
62	57	this.continuePromise = null;
63	58	}

@@ -69,7 +64,7 @@ export class SlashCommandDebugController {
69	64	}
70	65
71	66	async awaitContinue() {
72	67	this.continuePromise ??= new Promise(resolve => {
73	68	this.continueResolver = resolve;
74	69	});
75	70	this.isStepping = await this.continuePromise;

public/scripts/slash-commands/SlashCommandEnumAutoCompleteOption.js+1 -2 Viewed

@@ -9,7 +9,7 @@ export class SlashCommandEnumAutoCompleteOption extends AutoCompleteOption {
9	9	* @returns {SlashCommandEnumAutoCompleteOption}
10	10	*/
11	11	static from(cmd, enumValue) {
12	12	const mapped = this.valueToOptionMap.find(it => enumValue instanceof it.value)?.option ?? this;
13	13	return new mapped(cmd, enumValue);
14	14	}
15	15	/**@type {{value:(typeof SlashCommandEnumValue), option:(typeof SlashCommandEnumAutoCompleteOption)}[]} */

@@ -18,7 +18,6 @@ export class SlashCommandEnumAutoCompleteOption extends AutoCompleteOption {
18	18	/**@type {SlashCommandEnumValue}*/ enumValue;
19	19
20	20
21		-
22	21	/**
23	22	* @param {SlashCommand} cmd
24	23	* @param {SlashCommandEnumValue} enumValue

public/scripts/slash-commands/SlashCommandExecutionError.js+0 -1 Viewed

@@ -48,7 +48,6 @@ export class SlashCommandExecutionError extends Error {
48	48	}
49	49
50	50
51		-
52	51	constructor(cause, message, commandName, start, end, commandText, fullText) {
53	52	super(message, { cause });
54	53	this.commandName = commandName;

public/scripts/slash-commands/SlashCommandExecutor.js+6 -6 Viewed

@@ -17,10 +17,10 @@ export class SlashCommandExecutor {
17	17	get source() { return this.#source; }
18	18	set source(value) {
19	19	this.#source = value;
20	20	for (const arg of this.namedArgumentList.filter(it => it.value instanceof SlashCommandClosure)) {
21	21	arg.value.source = value;
22	22	}
23	23	for (const arg of this.unnamedArgumentList.filter(it => it.value instanceof SlashCommandClosure)) {
24	24	arg.value.source = value;
25	25	}
26	26	}

@@ -31,15 +31,15 @@ export class SlashCommandExecutor {
31	31
32	32	get commandCount() {
33	33	return 1
34	34	+ this.namedArgumentList.filter(it => it.value instanceof SlashCommandClosure).map(it =>/**@type {SlashCommandClosure}*/(it.value).commandCount).reduce((cur, sum) => cur + sum, 0)
35	35	+ this.unnamedArgumentList.filter(it => it.value instanceof SlashCommandClosure).map(it =>/**@type {SlashCommandClosure}*/(it.value).commandCount).reduce((cur, sum) => cur + sum, 0)
36	36	;
37	37	}
38	38
39	39	set onProgress(value) {
40	40	const closures = /**@type {SlashCommandClosure[]}*/([
41	41	...this.namedArgumentList.filter(it => it.value instanceof SlashCommandClosure).map(it => it.value),
42	42	...this.unnamedArgumentList.filter(it => it.value instanceof SlashCommandClosure).map(it => it.value),
43	43	]);
44	44	for (const closure of closures) {
45	45	closure.onProgress = value;

public/scripts/slash-commands/SlashCommandParser.js+20 -20 Viewed

@@ -65,7 +65,7 @@ export class SlashCommandParser {
65	65	static addCommandObject(command) {
66	66	const reserved = ['/', '#', ':', 'parser-flag', 'breakpoint'];
67	67	for (const start of reserved) {
68	68	if (command.name.toLowerCase().startsWith(start) || (command.aliases ?? []).find(a => a.toLowerCase().startsWith(start))) {
69	69	throw new Error(`Illegal Name. Slash command name cannot begin with "${start}".`);
70	70	}
71	71	}

@@ -80,15 +80,15 @@ export class SlashCommandParser {
80	80	console.trace('WARN: Duplicate slash command registered!', [command.name, ...command.aliases]);
81	81	}
82	82
83	83	const stack = new Error().stack.split('\n').map(it => it.trim());
84	84	command.isExtension = stack.find(it => it.includes('/scripts/extensions/')) != null;
85	85	command.isThirdParty = stack.find(it => it.includes('/scripts/extensions/third-party/')) != null;
86	86	if (command.isThirdParty) {
87	87	command.source = stack.find(it => it.includes('/scripts/extensions/third-party/')).replace(/^.*?\/scripts\/extensions\/third-party\/([^/]+)\/.*$/, '$1');
88	88	} else if (command.isExtension) {
89	89	command.source = stack.find(it => it.includes('/scripts/extensions/')).replace(/^.*?\/scripts\/extensions\/([^/]+)\/.*$/, '$1');
90	90	} else {
91	91	const idx = stack.findLastIndex(it => it.includes('at SlashCommandParser.')) + 1;
92	92	command.source = stack[idx].replace(/^.*?\/((?:scripts\/)?(?:[^/]+)\.js).*$/, '$1');
93	93	}
94	94

@@ -153,7 +153,7 @@ export class SlashCommandParser {
153	153	description: 'The parser flag to modify.',
154	154	typeList: [ARGUMENT_TYPE.STRING],
155	155	isRequired: true,
156	156	enumList: Object.keys(PARSER_FLAG).map(flag => new SlashCommandEnumValue(flag, help[PARSER_FLAG[flag]])),
157	157	}),
158	158	SlashCommandArgument.fromProps({
159	159	description: 'The state of the parser flag to set.',

@@ -439,7 +439,7 @@ export class SlashCommandParser {
439	439	PIPEBREAK,
440	440	PIPE,
441	441	);
442	442	hljs.registerLanguage('stscript', () => ({
443	443	case_insensitive: false,
444	444	keywords: [],
445	445	contains: [

@@ -480,19 +480,19 @@ export class SlashCommandParser {
480	480	}
481	481	}
482	482	const executor = this.commandIndex
483	483	.filter(it => it.start <= index && (it.end >= index || it.end == null))
484	484	.slice(-1)[0]
485	485	?? null
486	486	;
487	487
488	488	if (executor) {
489	489	const childClosure = this.closureIndex
490	490	.find(it => it.start <= index && (it.end >= index || it.end == null) && it.start > executor.start)
491	491	?? null
492	492	;
493	493	if (childClosure !== null) return null;
494	494	// Check if cursor is inside a macro
495	495	const macroEntry = this.macroIndex.findLast(it => it.start <= index && it.end >= index);
496	496	if (macroEntry) {
497	497	// Build macro info object for shared function
498	498	const macroContent = text.slice(macroEntry.start + 2, macroEntry.end - (text.slice(macroEntry.end - 2, macroEntry.end) === '}}' ? 2 : 0));

@@ -522,16 +522,16 @@ export class SlashCommandParser {
522	522	if (executor.name == ':') {
523	523	const options = this.scopeIndex[this.commandIndex.indexOf(executor)]
524	524	?.allVariableNames
525	525	?.map(it => new SlashCommandVariableAutoCompleteOption(it))
526	526	?? []
527	527	;
528	528	try {
529	529	if ('quickReplyApi' in globalThis) {
530	530	const qrApi = globalThis.quickReplyApi;
531	531	options.push(...qrApi.listSets()
532	532	.map(set => qrApi.listQuickReplies(set).map(qr => `${set}.${qr}`))
533	533	.flat()
534	534	.map(qr => new SlashCommandQuickReplyAutoCompleteOption(qr)),
535	535	);
536	536	}
537	537	} catch { /* empty */ }

@@ -540,8 +540,8 @@ export class SlashCommandParser {
540	540	executor.start,
541	541	options,
542	542	true,
543	543	() => `No matching variables in scope and no matching Quick Replies for "${result.name}"`,
544	544	() => 'No variables in scope and no Quick Replies found.',
545	545	);
546	546	return result;
547	547	}

@@ -741,7 +741,7 @@ export class SlashCommandParser {
741	741	return this.testSymbol(':}');
742	742	}
743	743	parseClosure(isRoot = false) {
744	744	const closureIndexEntry = { start: this.index + 1, end: null };
745	745	this.closureIndex.push(closureIndexEntry);
746	746	let injectPipe = true;
747	747	if (!isRoot) this.take(2); // discard opening {:

@@ -1023,14 +1023,14 @@ export class SlashCommandParser {
1023	1023	cmd.unnamedArgumentList = this.parseUnnamedArgument(cmd.command?.unnamedArgumentList?.length && cmd?.command?.splitUnnamedArgument, cmd?.command?.splitUnnamedArgumentCount, rawQuotes);
1024	1024	cmd.endUnnamedArgs = this.index;
1025	1025	if (cmd.name == 'let') {
1026	1026	const keyArg = cmd.namedArgumentList.find(it => it.name == 'key');
1027	1027	if (keyArg) {
1028	1028	this.scope.variableNames.push(keyArg.value.toString());
1029	1029	} else if (typeof cmd.unnamedArgumentList[0]?.value == 'string') {
1030	1030	this.scope.variableNames.push(cmd.unnamedArgumentList[0].value);
1031	1031	}
1032	1032	} else if (cmd.name == 'import') {
1033	1033	const value = /**@type {string[]}*/(cmd.unnamedArgumentList.map(it => it.value));
1034	1034	for (let i = 0; i < value.length; i++) {
1035	1035	const srcName = value[i];
1036	1036	let dstName = srcName;

public/scripts/slash-commands/SlashCommandScope.js+3 -5 Viewed

@@ -5,7 +5,7 @@ export class SlashCommandScope {
5	5	/** @type {string[]} */ variableNames = [];
6	6	get allVariableNames() {
7	7	const names = [...this.variableNames, ...(this.parent?.allVariableNames ?? [])];
8	8	return names.filter((it, idx) => idx == names.indexOf(it));
9	9	}
10	10	// @ts-ignore
11	11	/** @type {object.<string, string|SlashCommandClosure>} */ variables = {};

@@ -13,7 +13,7 @@ export class SlashCommandScope {
13	13	/** @type {object.<string, string|SlashCommandClosure>} */ macros = {};
14	14	/** @type {{key:string, value:string|SlashCommandClosure}[]} */
15	15	get macroList() {
16	16	return [...Object.keys(this.macros).map(key => ({ key, value: this.macros[key] })), ...(this.parent?.macroList ?? [])];
17	17	}
18	18	/** @type {SlashCommandScope} */ parent;
19	19	/** @type {string} */ #pipe;

@@ -40,7 +40,7 @@ export class SlashCommandScope {
40	40
41	41
42	42	setMacro(key, value, overwrite = true) {
43	43	if (overwrite || !this.macroList.find(it => it.key == key)) {
44	44	this.macros[key] = value;
45	45	}
46	46	}

@@ -109,8 +109,6 @@ export class SlashCommandScope {
109	109	}
110	110
111	111
112		-
113		-
114	112	export class SlashCommandScopeVariableExistsError extends Error {}
115	113
116	114

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

@@ -2091,7 +2091,6 @@ function onTagAsFolderClick() {
2091	2091	// If folder display has changed, we have to redraw the character list, otherwise this folders state would not change
2092	2092	printCharactersDebounced();
2093	2093	saveSettingsDebounced();
2094		-
2095	2094	}
2096	2095
2097	2096	function updateDrawTagFolder(element, tag) {

public/scripts/textgen-settings.js+2 -3 Viewed

@@ -802,7 +802,6 @@ async function getStatusTextgen() {
802	802	console.info('Status check aborted.', err.reason);
803	803	} else {
804	804	console.error('Error getting status', err);
805		-
806	805	}
807	806	setOnlineStatus('no_connection');
808	807	}

@@ -1126,7 +1125,7 @@ export function initTextGenSettings() {
1126	1125	* @returns void
1127	1126	*/
1128	1127	function showSamplerControls(apiType = null) {
1129	1128	$('#textgenerationwebui_api-settings [data-tg-samplers], #textgenerationwebui_api [data-tg-samplers]').each(function (idx, elem) {
1130	1129	const typeSpecificControlled = $(elem).data('tg-type') !== undefined;
1131	1130
1132	1131	if (!typeSpecificControlled) $(this).show();

@@ -1139,7 +1138,7 @@ function showSamplerControls(apiType = null) {
1139	1138
1140	1139	if (!samplersActivatedManually?.length || !prioritizeManualSamplerSelect) return;
1141	1140
1142	1141	$('#textgenerationwebui_api-settings [data-tg-samplers], #textgenerationwebui_api [data-tg-samplers]').each(function () {
1143	1142	const tgSamplers = $(this).attr('data-tg-samplers').split(',').map(x => x.trim()).filter(str => str !== '');
1144	1143
1145	1144	for (const tgSampler of tgSamplers) {

public/scripts/user.js+0 -4 Viewed

@@ -455,7 +455,6 @@ async function changeName(handle, name, callback) {
455	455
456	456	toastr.success('Name changed successfully', 'Name Changed');
457	457	callback();
458		-
459	458	} catch (error) {
460	459	console.error('Error changing name:', error);
461	460	}

@@ -495,7 +494,6 @@ async function restoreSnapshot(name, callback) {
495	494	} catch (error) {
496	495	console.error('Error restoring snapshot:', error);
497	496	}
498		-
499	497	}
500	498
501	499	/**

@@ -601,7 +599,6 @@ async function viewSettingsSnapshots() {
601	599	const content = await loadSnapshotContent(snapshot.name);
602	600	contentBlock.val(content);
603	601	}
604		-
605	602	});
606	603	template.find('.snapshotList').append(snapshotBlock);
607	604	}

@@ -667,7 +664,6 @@ async function resetEverything(callback) {
667	664	} catch (error) {
668	665	console.error('Error resetting everything:', error);
669	666	}
670		-
671	667	}
672	668
673	669	async function openUserProfile() {

public/scripts/utils.js+0 -1 Viewed

@@ -2310,7 +2310,6 @@ export function highlightRegex(regexStr) {
2310	2310	flags: new RegExp('(?<=\\/)([gimsuy]*)$', 'g'), // Match trailing flags
2311	2311	delimiters: new RegExp('^\\/|(?<![\\\\<])\\/', 'g'), // Match leading or trailing delimiters
2312	2312	};
2313		-
2314	2313	} catch (error) {
2315	2314	return {
2316	2315	brackets: new RegExp('(\\\\)?\\[.*?\\]', 'g'), // Non-escaped square brackets

public/scripts/world-info.js+0 -2 Viewed

@@ -675,7 +675,6 @@ class WorldInfoTimedEffects {
675	675	console.log('[WI] Timed effect "delay" applied to entry', entry);
676	676	}
677	677	}
678		-
679	678	}
680	679
681	680	/**

@@ -4495,7 +4494,6 @@ function parseDecorators(content) {
4495	4494	}
4496	4495
4497	4496	return [[], content];
4498		-
4499	4497	}
4500	4498
4501	4499	/**

src/endpoints/assets.js+0 -2 Viewed

@@ -111,7 +111,6 @@ router.post('/get', async (request, response) => {
111	111
112	112	try {
113	113	if (fs.existsSync(folderPath) && fs.statSync(folderPath).isDirectory()) {
114		-
115	114	ensureFoldersExist(request.user.directories);
116	115
117	116	const folders = fs.readdirSync(folderPath, { withFileTypes: true })

@@ -346,7 +345,6 @@ router.post('/character', async (request, response) => {
346	345	let output = [];
347	346	try {
348	347	if (fs.existsSync(folderPath) && fs.statSync(folderPath).isDirectory()) {
349		-
350	348	// Live2d assets
351	349	if (category == 'live2d') {
352	350	const folders = fs.readdirSync(folderPath, { withFileTypes: true });

src/endpoints/backends/text-completions.js+0 -2 Viewed

@@ -541,7 +541,6 @@ llamacpp.post('/props', async function (request, response) {
541	541	console.debug('LlamaCpp props response:', data);
542	542
543	543	return response.send(data);
544		-
545	544	} catch (error) {
546	545	console.error(error);
547	546	return response.sendStatus(500);

@@ -591,7 +590,6 @@ llamacpp.post('/slots', async function (request, response) {
591	590	console.debug('LlamaCpp slots response:', data);
592	591
593	592	return response.send(data);
594		-
595	593	} catch (error) {
596	594	console.error(error);
597	595	return response.sendStatus(500);

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

@@ -11,7 +11,7 @@ router.post('/chat/get', async (request, response) => {
11	11	const backupModels = [];
12	12	const backupFiles = await fsPromises
13	13	.readdir(request.user.directories.backups, { withFileTypes: true })
14	14	.then(d => d .filter(d => d.isFile() && path.extname(d.name) === '.jsonl' && d.name.startsWith(CHAT_BACKUPS_PREFIX)).map(d => d.name));
15	15
16	16	for (const name of backupFiles) {
17	17	const filePath = path.join(request.user.directories.backups, name);

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

@@ -639,7 +639,6 @@ function charaFormatData(data, directories) {
639	639	if (file && file.entries) {
640	640	_.set(char, 'data.character_book', convertWorldInfoToCharacterBook(data.world, file.entries));
641	641	}
642		-
643	642	} catch {
644	643	console.warn(`Failed to read world info file: ${data.world}. Character book will not be available.`);
645	644	}

@@ -921,7 +920,8 @@ async function importFromJson(uploadPath, { request }, preservedFileName) {
921	920	let charJSON = JSON.stringify(char);
922	921	const result = await writeCharacterData(DEFAULT_AVATAR_PATH, charJSON, pngName, request);
923	922	return result ? pngName : '';
924	923	} else if (jsonData.char_name !== undefined) {//json Pygmalion notepad
	924	+ //json Pygmalion notepad
925	925	console.info('Importing from gradio json');
926	926	jsonData.char_name = sanitize(jsonData.char_name);
927	927	if (jsonData.creator_notes) {

src/endpoints/extensions.js+0 -2 Viewed

@@ -367,7 +367,6 @@ router.post('/version', async (request, response) => {
367	367	const { isUpToDate, remoteUrl } = await checkIfRepoIsUpToDate(extensionPath);
368	368
369	369	return response.send({ currentBranchName, currentCommitHash, isUpToDate, remoteUrl });
370		-
371	370	} catch (error) {
372	371	console.error('Getting extension version failed', error);
373	372	return response.status(500).send(`Server Error: ${error.message}`);

@@ -406,7 +405,6 @@ router.post('/delete', async (request, response) => {
406	405	console.info(`Extension has been deleted at ${extensionPath}`);
407	406
408	407	return response.send(`Extension has been deleted at ${extensionPath}`);
409		-
410	408	} catch (error) {
411	409	console.error('Deleting custom content failed', error);
412	410	return response.status(500).send(`Server Error: ${error.message}`);

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

@@ -51,7 +51,7 @@ export async function migrateGroupChatsMetadataFormat(userDirectories) {
51	51	if (!needsMigration) {
52	52	continue;
53	53	}
54	54	if (!fs.existsSync(backupPath)) {
55	55	await fsPromises.mkdir(backupPath, { recursive: true });
56	56	}
57	57	await fsPromises.copyFile(groupFilePath, path.join(backupPath, groupFile.name));

src/endpoints/horde.js+0 -2 Viewed

@@ -256,7 +256,6 @@ router.post('/caption-image', async (request, response) => {
256	256	console.info(status);
257	257
258	258	if (status.state === HordeAsyncRequestStates.done) {
259		-
260	259	if (status.forms === undefined) {
261	260	console.error('Image interrogation request failed: no forms found.');
262	261	return response.sendStatus(500);

@@ -278,7 +277,6 @@ router.post('/caption-image', async (request, response) => {
278	277	return response.sendStatus(503);
279	278	}
280	279	}
281		-
282	280	} catch (error) {
283	281	console.error(error);
284	282	response.sendStatus(500);

src/endpoints/image-metadata.js+0 -1 Viewed

@@ -442,7 +442,6 @@ router.post('/', async function (request, response) {
442	442	}
443	443
444	444	return response.status(400).json({ error: 'Invalid request format.' });
445		-
446	445	} catch (error) {
447	446	console.error('[ImageMetadata] API error:', error);
448	447	return response.status(500).json({ error: 'Internal server error.' });

src/endpoints/minimax.js+0 -2 Viewed

@@ -189,7 +189,6 @@ router.post('/generate-voice', async (request, response) => {
189	189	response.setHeader('Content-Length', audioBytes.length);
190	190
191	191	return response.send(Buffer.from(audioBytes));
192		-
193	192	} catch (conversionError) {
194	193	console.error('MiniMax TTS: Audio conversion error:', conversionError);
195	194	return response.status(500).json({ error: `Audio data conversion failed: ${conversionError.message}` });

@@ -222,7 +221,6 @@ router.post('/generate-voice', async (request, response) => {
222	221	console.error('MiniMax TTS: No valid audio data in response:', responseData);
223	222	return response.status(500).json({ error: `API Error: ${errorMessage}` });
224	223	}
225		-
226	224	} catch (error) {
227	225	console.error('MiniMax TTS generation failed:', error);
228	226	return response.status(500).json({ error: 'Internal server error' });

src/endpoints/stable-diffusion.js+0 -1 Viewed

@@ -158,7 +158,6 @@ router.post('/samplers', async (request, response) => {
158	158	const data = await result.json();
159	159	const names = data.map(x => x.name);
160	160	return response.send(names);
161		-
162	161	} catch (error) {
163	162	console.error(error);
164	163	return response.sendStatus(500);

src/endpoints/thumbnails.js+0 -1 Viewed

@@ -301,7 +301,6 @@ publicRouter.get('/', async function (request, response) {
301	301
302	302	// Send a 404 so the frontend can display a placeholder
303	303	return response.sendStatus(404);
304		-
305	304	} catch (error) {
306	305	console.error('Failed getting thumbnail', error);
307	306	return response.sendStatus(500);

src/prompt-converters.js+1 -2 Viewed

@@ -118,7 +118,6 @@ export function postProcessPrompt(messages, type, names) {
118	118	* @copyright Prompt Conversion script taken from RisuAI by kwaroran (GPLv3).
119	119	*/
120	120	export function convertClaudePrompt(messages, addAssistantPostfix, addAssistantPrefill, withSysPromptSupport, useSystemPrompt, addSysHumanMsg, excludePrefixes) {
121		-
122	121	//Prepare messages for claude.
123	122	//When 'Exclude Human/Assistant prefixes' checked, setting messages role to the 'system'(last message is exception).
124	123	if (messages.length > 0) {

@@ -1278,7 +1277,7 @@ export function calculateGoogleBudgetTokens(maxTokens, reasoningEffort, model) {
1278	1277	return getGemini3ProBudget();
1279	1278	}
1280	1279
1281	1280	if (/gemini-3-flash/.test(model) ) {
1282	1281	return getGemini3FlashBudget();
1283	1282	}
1284	1283

src/util.js+0 -1 Viewed

@@ -1012,7 +1012,6 @@ export async function canResolve(name, useIPv6 = true, useIPv4 = true) {
1012	1012	}
1013	1013
1014	1014	return v6Resolved || v4Resolved;
1015		-
1016	1015	} catch (error) {
1017	1016	return false;
1018	1017	}