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

Fix bug when only global bans are defined

Browse Source
This commit is contained in:
Cohee
2025-02-15 00:34:07 +02:00
parent 8a4cf86b65
commit c37c9051a6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/scripts/textgen-settings.js
View File

@@ -399,7 +399,7 @@ function getTokenizerForTokenIds() {
* @returns {TokenBanResult} String with comma-separated banned token IDs * @returns {TokenBanResult} String with comma-separated banned token IDs
*/ */
function getCustomTokenBans() { function getCustomTokenBans() {
if (!settings.send_banned_tokens || (!settings.banned_tokens && !textgenerationwebui_banned_in_macros.length)) { if (!settings.send_banned_tokens || (!settings.banned_tokens && !settings.global_banned_tokens && !textgenerationwebui_banned_in_macros.length)) {
return { return {
banned_tokens: '', banned_tokens: '',
banned_strings: [], banned_strings: [],
@@ -460,7 +460,7 @@ function getCustomTokenBans() {
async function enableBannedStringsKillSwitch() { async function enableBannedStringsKillSwitch() {
$('#send_banned_tokens_textgenerationwebui').prop('checked', true); $('#send_banned_tokens_textgenerationwebui').prop('checked', true);
$('#send_banned_tokens_label').find('.menu_button').addClass('toggleEnabled').prop('title', t`Banned tokens/strings are being sent into the request.`); $('#send_banned_tokens_label').find('.menu_button').addClass('toggleEnabled').prop('title', t`Banned tokens/strings are being sent in the request.`);
settings.send_banned_tokens = true; settings.send_banned_tokens = true;
saveSettingsDebounced(); saveSettingsDebounced();
return ''; return '';
@@ -468,7 +468,7 @@ async function enableBannedStringsKillSwitch() {
async function disableBannedStringsKillSwitch() { async function disableBannedStringsKillSwitch() {
$('#send_banned_tokens_textgenerationwebui').prop('checked', false); $('#send_banned_tokens_textgenerationwebui').prop('checked', false);
$('#send_banned_tokens_label').find('.menu_button').removeClass('toggleEnabled').prop('title', t`Banned tokens/strings are NOT being sent into the request.`); $('#send_banned_tokens_label').find('.menu_button').removeClass('toggleEnabled').prop('title', t`Banned tokens/strings are NOT being sent in the request.`);
settings.send_banned_tokens = false; settings.send_banned_tokens = false;
saveSettingsDebounced(); saveSettingsDebounced();
return ''; return '';