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

Code clean-up

Browse Source
This commit is contained in:
Cohee 2023-11-12 22:35:17 +02:00
parent 9a1d1594d6
commit 0d4e5c31e2
5 changed files with 6 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/index.html
View File

@ -2125,9 +2125,6 @@
<label> <label>
<small data-i18n="System Prompt">System Prompt</small> <small data-i18n="System Prompt">System Prompt</small>
</label> </label>
<div class="prompt_overridden">
Overridden by the Character Definitions.
</div>
<textarea id="instruct_system_prompt" class="text_pole textarea_compact autoSetHeight" rows="1"></textarea> <textarea id="instruct_system_prompt" class="text_pole textarea_compact autoSetHeight" rows="1"></textarea>
</div> </div>
<div data-newbie-hidden class="inline-drawer wide100p flexFlowColumn"> <div data-newbie-hidden class="inline-drawer wide100p flexFlowColumn">

26
public/script.js
View File

@ -314,11 +314,6 @@ export const event_types = {
export const eventSource = new EventEmitter(); export const eventSource = new EventEmitter();
// Check for override warnings every 5 seconds...
setInterval(displayOverrideWarnings, 5000);
// ...or when the chat changes
eventSource.on(event_types.SETTINGS_LOADED, () => { settingsReady = true; });
eventSource.on(event_types.CHAT_CHANGED, displayOverrideWarnings);
eventSource.on(event_types.MESSAGE_RECEIVED, processExtensionHelpers); eventSource.on(event_types.MESSAGE_RECEIVED, processExtensionHelpers);
eventSource.on(event_types.MESSAGE_SENT, processExtensionHelpers); eventSource.on(event_types.MESSAGE_SENT, processExtensionHelpers);
@ -730,7 +725,7 @@ async function firstLoadInit() {
sendSystemMessage(system_message_types.WELCOME); sendSystemMessage(system_message_types.WELCOME);
await readSecretState(); await readSecretState();
await getClientVersion(); await getClientVersion();
await getSettings("def"); await getSettings();
await getUserAvatars(); await getUserAvatars();
await getCharacters(); await getCharacters();
await getBackgrounds(); await getBackgrounds();
@ -1081,7 +1076,6 @@ async function printCharacters(fullRefresh = false) {
} }
await delay(1); await delay(1);
displayOverrideWarnings();
} }
const storageKey = 'Characters_PerPage'; const storageKey = 'Characters_PerPage';
@ -5236,7 +5230,7 @@ async function doOnboarding(avatarId) {
//***************SETTINGS****************// //***************SETTINGS****************//
/////////////////////////////////////////// ///////////////////////////////////////////
async function getSettings(type) { async function getSettings() {
const response = await fetch("/getsettings", { const response = await fetch("/getsettings", {
method: "POST", method: "POST",
headers: getRequestHeaders(), headers: getRequestHeaders(),
@ -5409,6 +5403,7 @@ async function getSettings(type) {
} }
} }
settingsReady = true;
eventSource.emit(event_types.SETTINGS_LOADED); eventSource.emit(event_types.SETTINGS_LOADED);
} }
@ -7133,19 +7128,6 @@ const swipe_right = () => {
} }
} }
function displayOverrideWarnings() {
if (!this_chid || !selected_group) {
$('.prompt_overridden').hide();
$('.jailbreak_overridden').hide();
return;
}
$('.prompt_overridden').toggle(!!(characters[this_chid]?.data?.system_prompt));
$('.jailbreak_overridden').toggle(!!(characters[this_chid]?.data?.post_history_instructions));
}
function connectAPISlash(_, text) { function connectAPISlash(_, text) {
if (!text) return; if (!text) return;
@ -8696,7 +8678,7 @@ jQuery(async function () {
startStatusLoading(); startStatusLoading();
// Check near immediately rather than waiting for up to 90s // Check near immediately rather than waiting for up to 90s
setTimeout(getStatusNovel, 10); await getStatusNovel();
}); });
//**************************CHARACTER IMPORT EXPORT*************************// //**************************CHARACTER IMPORT EXPORT*************************//

2
public/scripts/extensions/quick-reply/index.js
View File

@ -21,7 +21,7 @@ const defaultSettings = {
//method from worldinfo //method from worldinfo
async function updateQuickReplyPresetList() { async function updateQuickReplyPresetList() {
var result = await fetch("/getsettings", { const result = await fetch("/getsettings", {
method: "POST", method: "POST",
headers: getRequestHeaders(), headers: getRequestHeaders(),
body: JSON.stringify({}), body: JSON.stringify({}),

2
public/scripts/world-info.js
View File

@ -227,7 +227,7 @@ async function loadWorldInfoData(name) {
} }
async function updateWorldInfoList() { async function updateWorldInfoList() {
var result = await fetch("/getsettings", { const result = await fetch("/getsettings", {
method: "POST", method: "POST",
headers: getRequestHeaders(), headers: getRequestHeaders(),
body: JSON.stringify({}), body: JSON.stringify({}),

8
public/style.css
View File

@ -3492,14 +3492,6 @@ a {
align-items: center; align-items: center;
} }
.prompt_overridden,
.jailbreak_overridden {
color: var(--SmartThemeQuoteColor);
font-weight: bold;
font-style: italic;
font-size: 0.8em;
}
.openai_restorable .right_menu_button img { .openai_restorable .right_menu_button img {
height: 20px; height: 20px;
} }