mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Fix default value for filter argument
This commit is contained in:
@ -4,7 +4,7 @@ import { characters, eventSource, event_types, generateRaw, getRequestHeaders, m
|
|||||||
import { dragElement, isMobile } from '../../RossAscends-mods.js';
|
import { dragElement, isMobile } from '../../RossAscends-mods.js';
|
||||||
import { getContext, getApiUrl, modules, extension_settings, ModuleWorkerWrapper, doExtrasFetch, renderExtensionTemplateAsync } from '../../extensions.js';
|
import { getContext, getApiUrl, modules, extension_settings, ModuleWorkerWrapper, doExtrasFetch, renderExtensionTemplateAsync } from '../../extensions.js';
|
||||||
import { loadMovingUIState, performFuzzySearch, power_user } from '../../power-user.js';
|
import { loadMovingUIState, performFuzzySearch, power_user } from '../../power-user.js';
|
||||||
import { onlyUnique, debounce, getCharaFilename, trimToEndSentence, trimToStartSentence, waitUntilCondition, findChar, isTrueBoolean } from '../../utils.js';
|
import { onlyUnique, debounce, getCharaFilename, trimToEndSentence, trimToStartSentence, waitUntilCondition, findChar, isFalseBoolean } from '../../utils.js';
|
||||||
import { hideMutedSprites, selected_group } from '../../group-chats.js';
|
import { hideMutedSprites, selected_group } from '../../group-chats.js';
|
||||||
import { isJsonSchemaSupported } from '../../textgen-settings.js';
|
import { isJsonSchemaSupported } from '../../textgen-settings.js';
|
||||||
import { debounce_timeout } from '../../constants.js';
|
import { debounce_timeout } from '../../constants.js';
|
||||||
@ -689,7 +689,7 @@ async function classifyCallback(/** @type {{api: string?, filter: string?, promp
|
|||||||
}
|
}
|
||||||
|
|
||||||
const expressionApi = EXPRESSION_API[api] || extension_settings.expressions.api;
|
const expressionApi = EXPRESSION_API[api] || extension_settings.expressions.api;
|
||||||
const filterAvailable = isTrueBoolean(filter);
|
const filterAvailable = !isFalseBoolean(filter);
|
||||||
|
|
||||||
if (!modules.includes('classify') && expressionApi == EXPRESSION_API.extras) {
|
if (!modules.includes('classify') && expressionApi == EXPRESSION_API.extras) {
|
||||||
toastr.warning('Text classification is disabled or not available');
|
toastr.warning('Text classification is disabled or not available');
|
||||||
@ -2303,13 +2303,13 @@ function migrateSettings() {
|
|||||||
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
|
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
|
||||||
name: 'expression-list',
|
name: 'expression-list',
|
||||||
aliases: ['expressions'],
|
aliases: ['expressions'],
|
||||||
/** @type {(args: {return: string, filterAvailable: string}) => Promise<string>} */
|
/** @type {(args: {return: string, filter: string}) => Promise<string>} */
|
||||||
callback: async (args) => {
|
callback: async (args) => {
|
||||||
let returnType =
|
let returnType =
|
||||||
/** @type {import('../../slash-commands/SlashCommandReturnHelper.js').SlashCommandReturnType} */
|
/** @type {import('../../slash-commands/SlashCommandReturnHelper.js').SlashCommandReturnType} */
|
||||||
(args.return);
|
(args.return);
|
||||||
|
|
||||||
const list = await getExpressionsList({ filterAvailable: isTrueBoolean(args.filterAvailable) });
|
const list = await getExpressionsList({ filterAvailable: !isFalseBoolean(args.filter) });
|
||||||
|
|
||||||
return await slashCommandReturnHelper.doReturn(returnType ?? 'pipe', list, { objectToStringFunc: list => list.join(', ') });
|
return await slashCommandReturnHelper.doReturn(returnType ?? 'pipe', list, { objectToStringFunc: list => list.join(', ') });
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user