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

Merge branch 'staging' into sysprompt-divorce

Browse Source
This commit is contained in:
Cohee 2024-09-22 12:35:28 +03:00
commit 1864b7d868
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/script.js
View File

@ -100,7 +100,7 @@ import {
proxies, proxies,
loadProxyPresets, loadProxyPresets,
selected_proxy, selected_proxy,
initOpenai, initOpenAI,
} from './scripts/openai.js'; } from './scripts/openai.js';
import { import {
@ -930,9 +930,10 @@ async function firstLoadInit() {
addSafariPatch(); addSafariPatch();
await getClientVersion(); await getClientVersion();
await readSecretState(); await readSecretState();
initLocales(); await initLocales();
initDefaultSlashCommands(); initDefaultSlashCommands();
initTextGenModels(); initTextGenModels();
initOpenAI();
initSystemPrompts(); initSystemPrompts();
await initPresetManager(); await initPresetManager();
await getSystemMessages(); await getSystemMessages();
@ -942,7 +943,6 @@ async function firstLoadInit() {
initKeyboard(); initKeyboard();
initDynamicStyles(); initDynamicStyles();
initTags(); initTags();
initOpenai();
initBookmarks(); initBookmarks();
await getUserAvatars(true, user_avatar); await getUserAvatars(true, user_avatar);
await getCharacters(); await getCharacters();

5
public/scripts/chats.js
View File

@ -135,10 +135,11 @@ export async function hideChatMessageRange(start, end, unhide) {
const message = chat[messageId]; const message = chat[messageId];
if (!message) continue; if (!message) continue;
message.is_system = hide;
// Also toggle "hidden" state for all visible messages
const messageBlock = $(`.mes[mesid="${messageId}"]`); const messageBlock = $(`.mes[mesid="${messageId}"]`);
if (!messageBlock.length) continue; if (!messageBlock.length) continue;
message.is_system = hide;
messageBlock.attr('is_system', String(hide)); messageBlock.attr('is_system', String(hide));
} }

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

@ -3813,7 +3813,10 @@ jQuery(async () => {
], ],
helpString: ` helpString: `
<div> <div>
Requests to generate an image and posts it to chat (unless <code>quiet=true</code> argument is specified).</code>. Requests to generate an image and posts it to chat (unless <code>quiet=true</code> argument is specified).
</div>
<div>
Supported arguments: <code>${Object.values(triggerWords).flat().join(', ')}</code>.
</div> </div>
<div> <div>
Anything else would trigger a "free mode" to make generate whatever you prompted. Example: <code>/imagine apple tree</code> would generate a picture of an apple tree. Returns a link to the generated image. Anything else would trigger a "free mode" to make generate whatever you prompted. Example: <code>/imagine apple tree</code> would generate a picture of an apple tree. Returns a link to the generated image.

6
public/scripts/openai.js
View File

@ -4937,7 +4937,7 @@ function runProxyCallback(_, value) {
return foundName; return foundName;
} }
export function initOpenai() { export function initOpenAI() {
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'proxy', name: 'proxy',
callback: runProxyCallback, callback: runProxyCallback,
@ -4953,9 +4953,7 @@ export function initOpenai() {
], ],
helpString: 'Sets a proxy preset by name.', helpString: 'Sets a proxy preset by name.',
})); }));
}
$(document).ready(async function () {
$('#test_api_button').on('click', testApiConnection); $('#test_api_button').on('click', testApiConnection);
$('#scale-alt').on('change', function () { $('#scale-alt').on('change', function () {
@ -5419,4 +5417,4 @@ $(document).ready(async function () {
$('#openai_proxy_password_show').on('click', onProxyPasswordShowClick); $('#openai_proxy_password_show').on('click', onProxyPasswordShowClick);
$('#customize_additional_parameters').on('click', onCustomizeParametersClick); $('#customize_additional_parameters').on('click', onCustomizeParametersClick);
$('#openai_proxy_preset').on('change', onProxyPresetChange); $('#openai_proxy_preset').on('change', onProxyPresetChange);
}); }