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

Rename URL validation util function

Browse Source
This commit is contained in:
Cohee 2023-10-16 00:50:29 +03:00
parent 0f15d2d45b
commit 5b954a3584
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/scripts/RossAscends-mods.js
View File

@ -31,7 +31,7 @@ import {
SECRET_KEYS,
secret_state,
} from "./secrets.js";
import { debounce, delay, getStringHash, isUrlOrAPIKey, waitUntilCondition } from "./utils.js";
import { debounce, delay, getStringHash, isValidUrl, waitUntilCondition } from "./utils.js";
import { chat_completion_sources, oai_settings } from "./openai.js";
import { getTokenCount } from "./tokenizers.js";
@ -394,7 +394,7 @@ function RA_autoconnect(PrevApi) {
if (online_status === "no_connection" && LoadLocalBool('AutoConnectEnabled')) {
switch (main_api) {
case 'kobold':
if (api_server && isUrlOrAPIKey(api_server)) {
if (api_server && isValidUrl(api_server)) {
$("#api_button").click();
}
break;
@ -404,7 +404,7 @@ function RA_autoconnect(PrevApi) {
}
break;
case 'textgenerationwebui':
if (api_server_textgenerationwebui && isUrlOrAPIKey(api_server_textgenerationwebui)) {
if (api_server_textgenerationwebui && isValidUrl(api_server_textgenerationwebui)) {
$("#api_button_textgenerationwebui").click();
}
break;

4
public/scripts/server-history.js
View File

@ -1,6 +1,6 @@
import { saveSettingsDebounced } from "../script.js";
import { power_user } from "./power-user.js";
import { isUrlOrAPIKey } from "./utils.js";
import { isValidUrl } from "./utils.js";
/**
* @param {{ term: string; }} request
@ -64,7 +64,7 @@ function onServerConnectClick() {
const value = String($(`[data-server-history="${serverLabel}"]`).val()).toLowerCase().trim();
// Don't save empty values or invalid URLs
if (!value || !isUrlOrAPIKey(value)) {
if (!value || !isValidUrl(value)) {
return;
}

2
public/scripts/utils.js
View File

@ -18,7 +18,7 @@ export function escapeHtml(str) {
return String(str).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
}
export function isUrlOrAPIKey(value) {
export function isValidUrl(value) {
try {
new URL(value);
return true;