rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-02-20 14:10:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1707 from LenAnderson/qr-fixes

Browse Source 
Several QR fixes
This commit is contained in:
Cohee 2024-01-17 11:12:38 +02:00 committed by GitHub
commit 617cabd7b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
public/scripts/extensions/quick-reply/src/SlashCommandHandler.js
View File

@ -1,4 +1,5 @@
import { registerSlashCommand } from '../../../slash-commands.js'; import { registerSlashCommand } from '../../../slash-commands.js';
import { isTrueBoolean } from '../../../utils.js';
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
import { QuickReplyApi } from '../api/QuickReplyApi.js'; import { QuickReplyApi } from '../api/QuickReplyApi.js';
@ -35,7 +36,7 @@ export class SlashCommandHandler {
user - bool - auto execute on user message, e.g., user=true user - bool - auto execute on user message, e.g., user=true
bot - bool - auto execute on AI message, e.g., bot=true bot - bool - auto execute on AI message, e.g., bot=true
load - bool - auto execute on chat load, e.g., load=true load - bool - auto execute on chat load, e.g., load=true
title - bool - title / tooltip to be shown on button, e.g., title="My Fancy Button" title - string - title / tooltip to be shown on button, e.g., title="My Fancy Button"
`.trim(); `.trim();
const qrUpdateArgs = ` const qrUpdateArgs = `
newlabel - string - new text for the button, e.g. newlabel=MyRenamedButton newlabel - string - new text for the button, e.g. newlabel=MyRenamedButton
@ -90,14 +91,14 @@ export class SlashCommandHandler {
toggleGlobalSet(name, args = {}) { toggleGlobalSet(name, args = {}) {
try { try {
this.api.toggleGlobalSet(name, JSON.parse(args.visible ?? 'true') === true); this.api.toggleGlobalSet(name, isTrueBoolean(args.visible ?? 'true'));
} catch (ex) { } catch (ex) {
toastr.error(ex.message); toastr.error(ex.message);
} }
} }
addGlobalSet(name, args = {}) { addGlobalSet(name, args = {}) {
try { try {
this.api.addGlobalSet(name, JSON.parse(args.visible ?? 'true') === true); this.api.addGlobalSet(name, isTrueBoolean(args.visible ?? 'true'));
} catch (ex) { } catch (ex) {
toastr.error(ex.message); toastr.error(ex.message);
} }
@ -113,14 +114,14 @@ export class SlashCommandHandler {
toggleChatSet(name, args = {}) { toggleChatSet(name, args = {}) {
try { try {
this.api.toggleChatSet(name, JSON.parse(args.visible ?? 'true') === true); this.api.toggleChatSet(name, isTrueBoolean(args.visible ?? 'true'));
} catch (ex) { } catch (ex) {
toastr.error(ex.message); toastr.error(ex.message);
} }
} }
addChatSet(name, args = {}) { addChatSet(name, args = {}) {
try { try {
this.api.addChatSet(name, JSON.parse(args.visible ?? 'true') === true); this.api.addChatSet(name, isTrueBoolean(args.visible ?? 'true'));
} catch (ex) { } catch (ex) {
toastr.error(ex.message); toastr.error(ex.message);
} }
@ -142,11 +143,11 @@ export class SlashCommandHandler {
{ {
message: message ?? '', message: message ?? '',
title: args.title, title: args.title,
isHidden: JSON.parse(args.hidden ?? 'false') === true, isHidden: isTrueBoolean(args.hidden),
executeOnStartup: JSON.parse(args.startup ?? 'false') === true, executeOnStartup: isTrueBoolean(args.startup),
executeOnUser: JSON.parse(args.user ?? 'false') === true, executeOnUser: isTrueBoolean(args.user),
executeOnAi: JSON.parse(args.bot ?? 'false') === true, executeOnAi: isTrueBoolean(args.bot),
executeOnChatChange: JSON.parse(args.load ?? 'false') === true, executeOnChatChange: isTrueBoolean(args.load),
}, },
); );
} catch (ex) { } catch (ex) {
@ -162,11 +163,11 @@ export class SlashCommandHandler {
newLabel: args.newlabel, newLabel: args.newlabel,
message: (message ?? '').trim().length > 0 ? message : undefined, message: (message ?? '').trim().length > 0 ? message : undefined,
title: args.title, title: args.title,
isHidden: args.hidden, isHidden: args.hidden === undefined ? undefined : isTrueBoolean(args.hidden),
executeOnStartup: args.startup, executeOnStartup: args.startup === undefined ? undefined : isTrueBoolean(args.startup),
executeOnUser: args.user, executeOnUser: args.user === undefined ? undefined : isTrueBoolean(args.user),
executeOnAi: args.bot, executeOnAi: args.bot === undefined ? undefined : isTrueBoolean(args.bot),
executeOnChatChange: args.load, executeOnChatChange: args.load === undefined ? undefined : isTrueBoolean(args.load),
}, },
); );
} catch (ex) { } catch (ex) {
@ -188,7 +189,7 @@ export class SlashCommandHandler {
args.set, args.set,
args.label, args.label,
name, name,
JSON.parse(args.chain ?? 'false') === true, isTrueBoolean(args.chain),
); );
} catch (ex) { } catch (ex) {
toastr.error(ex.message); toastr.error(ex.message);
@ -215,9 +216,9 @@ export class SlashCommandHandler {
this.api.createSet( this.api.createSet(
args.name ?? name ?? '', args.name ?? name ?? '',
{ {
disableSend: JSON.parse(args.nosend ?? 'false') === true, disableSend: isTrueBoolean(args.nosend),
placeBeforeInput: JSON.parse(args.before ?? 'false') === true, placeBeforeInput: isTrueBoolean(args.before),
injectInput: JSON.parse(args.inject ?? 'false') === true, injectInput: isTrueBoolean(args.inject),
}, },
); );
} catch (ex) { } catch (ex) {
@ -229,9 +230,9 @@ export class SlashCommandHandler {
this.api.updateSet( this.api.updateSet(
args.name ?? name ?? '', args.name ?? name ?? '',
{ {
disableSend: args.nosend !== undefined ? JSON.parse(args.nosend ?? 'false') === true : undefined, disableSend: args.nosend !== undefined ? isTrueBoolean(args.nosend) : undefined,
placeBeforeInput: args.before !== undefined ? JSON.parse(args.before ?? 'false') === true : undefined, placeBeforeInput: args.before !== undefined ? isTrueBoolean(args.before) : undefined,
injectInput: args.inject !== undefined ? JSON.parse(args.inject ?? 'false') === true : undefined, injectInput: args.inject !== undefined ? isTrueBoolean(args.inject) : undefined,
}, },
); );
} catch (ex) { } catch (ex) {