rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into parser-followup-2

Browse Source
This commit is contained in:
LenAnderson
2024-06-28 16:19:27 -04:00
parent 058f45ec71 a287ccfca2
commit a08ab79181
36 changed files with 949 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/scripts/extensions/memory/index.js
View File

@@ -447,7 +447,7 @@ async function summarizeCallback(args, text) {
}
const source = args.source || extension_settings.memory.source;
const prompt = substituteParamsExtended((resolveVariable(args.prompt) || extension_settings.memory.prompt), { words: extension_settings.memory.promptWords });
const prompt = substituteParamsExtended((args.prompt || extension_settings.memory.prompt), { words: extension_settings.memory.promptWords });
try {
switch (source) {
@@ -923,10 +923,8 @@ jQuery(async function () {
SlashCommandNamedArgument.fromProps({
name: 'prompt',
description: 'prompt to use for summarization',
typeList: [ARGUMENT_TYPE.STRING, ARGUMENT_TYPE.VARIABLE_NAME],
typeList: [ARGUMENT_TYPE.STRING],
defaultValue: '',
enumProvider: commonEnumProviders.variables('all'),
forceEnum: false,
}),
],
unnamedArgumentList: [

1
public/scripts/extensions/quick-reply/src/QuickReplySet.js
View File

@@ -257,6 +257,7 @@ export class QuickReplySet {
this.rerender();
} else {
warn(`Failed to save Quick Reply Set: ${this.name}`);
console.error('QR could not be saved', response);
}
}

8
public/scripts/extensions/regex/index.js
View File

@@ -349,7 +349,7 @@ function migrateSettings() {
/**
* /regex slash command callback
* @param {object} args Named arguments
* @param {{name: string}} args Named arguments
* @param {string} value Unnamed argument
* @returns {string} The regexed string
*/
@@ -359,11 +359,11 @@ function runRegexCallback(args, value) {
return value;
}
const scriptName = String(resolveVariable(args.name));
const scriptName = args.name;
const scripts = getRegexScripts();
for (const script of scripts) {
if (String(script.scriptName).toLowerCase() === String(scriptName).toLowerCase()) {
if (script.scriptName.toLowerCase() === scriptName.toLowerCase()) {
if (script.disabled) {
toastr.warning(`Regex script "${scriptName}" is disabled.`);
return value;
@@ -588,7 +588,7 @@ jQuery(async () => {
SlashCommandNamedArgument.fromProps({
name: 'name',
description: 'script name',
typeList: [ARGUMENT_TYPE.STRING, ARGUMENT_TYPE.VARIABLE_NAME],
typeList: [ARGUMENT_TYPE.STRING],
isRequired: true,
enumProvider: localEnumProviders.regexScripts,
}),

5
public/scripts/extensions/stable-diffusion/index.js
View File

@@ -2206,7 +2206,7 @@ async function generatePicture(initiator, args, trigger, message, callback) {
}
const dimensions = setTypeSpecificDimensions(generationType);
let negativePromptPrefix = resolveVariable(args?.negative) || '';
let negativePromptPrefix = args?.negative || '';
let imagePath = '';
try {
@@ -3356,8 +3356,7 @@ jQuery(async () => {
SlashCommandNamedArgument.fromProps({
name: 'negative',
description: 'negative prompt prefix',
typeList: [ARGUMENT_TYPE.STRING, ARGUMENT_TYPE.VARIABLE_NAME],
enumProvider: commonEnumProviders.variables('all'),
typeList: [ARGUMENT_TYPE.STRING],
}),
],
unnamedArgumentList: [