mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Merge branch 'staging' into hidden-reasoning-tracking
This commit is contained in:
@ -73,6 +73,7 @@ import { SlashCommandEnumValue } from './slash-commands/SlashCommandEnumValue.js
|
||||
import { Popup, POPUP_RESULT } from './popup.js';
|
||||
import { t } from './i18n.js';
|
||||
import { ToolManager } from './tool-calling.js';
|
||||
import { accountStorage } from './util/AccountStorage.js';
|
||||
|
||||
export {
|
||||
openai_messages_count,
|
||||
@ -413,7 +414,7 @@ async function validateReverseProxy() {
|
||||
throw err;
|
||||
}
|
||||
const rememberKey = `Proxy_SkipConfirm_${getStringHash(oai_settings.reverse_proxy)}`;
|
||||
const skipConfirm = localStorage.getItem(rememberKey) === 'true';
|
||||
const skipConfirm = accountStorage.getItem(rememberKey) === 'true';
|
||||
|
||||
const confirmation = skipConfirm || await Popup.show.confirm(t`Connecting To Proxy`, await renderTemplateAsync('proxyConnectionWarning', { proxyURL: DOMPurify.sanitize(oai_settings.reverse_proxy) }));
|
||||
|
||||
@ -424,7 +425,7 @@ async function validateReverseProxy() {
|
||||
throw new Error('Proxy connection denied.');
|
||||
}
|
||||
|
||||
localStorage.setItem(rememberKey, String(true));
|
||||
accountStorage.setItem(rememberKey, String(true));
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user