Merge branch 'main' into dev

This commit is contained in:
SillyLossy
2023-04-22 23:57:05 +03:00

View File

@@ -2378,6 +2378,12 @@ const tavernUrl = new URL(
(':' + server_port) (':' + server_port)
); );
const autorunUrl = new URL(
(cliArguments.ssl ? 'https://' : 'http://') +
('127.0.0.1') +
(':' + server_port)
);
const setupTasks = async function () { const setupTasks = async function () {
ensurePublicDirectoriesExist(); ensurePublicDirectoriesExist();
await ensureThumbnailCache(); await ensureThumbnailCache();
@@ -2387,8 +2393,8 @@ const setupTasks = async function () {
console.log('Launching...'); console.log('Launching...');
if (autorun) open(tavernUrl.toString()); if (autorun) open(autorunUrl.toString());
console.log('SillyTavern started: ' + tavernUrl); console.log('SillyTavern is listening on: ' + tavernUrl);
if (fs.existsSync('public/characters/update.txt') && !is_colab) { if (fs.existsSync('public/characters/update.txt') && !is_colab) {
convertStage1(); convertStage1();