mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Merge pull request #901 from 50h100a/mancer-urlfix
Relax URL requirements when Mancer is enabled.
This commit is contained in:
@ -7780,9 +7780,9 @@ $(document).ready(function () {
|
|||||||
$("#api_button_textgenerationwebui").click(async function (e) {
|
$("#api_button_textgenerationwebui").click(async function (e) {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
if ($("#textgenerationwebui_api_url_text").val() != "") {
|
if ($("#textgenerationwebui_api_url_text").val() != "") {
|
||||||
let value = formatTextGenURL($("#textgenerationwebui_api_url_text").val().trim())
|
let value = formatTextGenURL($("#textgenerationwebui_api_url_text").val().trim(), api_use_mancer_webui);
|
||||||
if (!value) {
|
if (!value) {
|
||||||
callPopup('Please enter a valid URL.<br/>WebUI URLs should end with <tt>/api</tt>', 'text');
|
callPopup("Please enter a valid URL.<br/>WebUI URLs should end with <tt>/api</tt><br/>Enable 'Relaxed API URLs' to allow other paths.", 'text');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -99,11 +99,17 @@ function selectPreset(name) {
|
|||||||
saveSettingsDebounced();
|
saveSettingsDebounced();
|
||||||
}
|
}
|
||||||
|
|
||||||
function formatTextGenURL(value) {
|
function formatTextGenURL(value, use_mancer) {
|
||||||
try {
|
try {
|
||||||
const url = new URL(value);
|
const url = new URL(value);
|
||||||
if (!power_user.relaxed_api_urls) {
|
if (!power_user.relaxed_api_urls) {
|
||||||
url.pathname = '/api';
|
if (use_mancer) { // If Mancer is in use, only require the URL to *end* with `/api`.
|
||||||
|
if (!url.pathname.endsWith('/api')) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
url.pathname = '/api';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return url.toString();
|
return url.toString();
|
||||||
} catch { } // Just using URL as a validation check
|
} catch { } // Just using URL as a validation check
|
||||||
|
Reference in New Issue
Block a user