diff --git a/public/script.js b/public/script.js index cd49c03a4..dab17418d 100644 --- a/public/script.js +++ b/public/script.js @@ -1369,7 +1369,12 @@ function getExtensionPrompt(position = 0, depth = undefined, separator = "\n") { function baseChatReplace(value, name1, name2) { if (value !== undefined && value.length > 0) { - value = substituteParams(value, is_pygmalion ? "You" : name1, name2); + if (is_pygmalion) { + value = value.replace(/{{user}}:/gi, 'You:'); + value = value.replace(/:/gi, 'You:'); + } + + value = substituteParams(value, name1, name2); if (power_user.collapse_newlines) { value = collapseNewlines(value); @@ -2738,7 +2743,7 @@ function saveReply(type, getMessage, this_mes_is_name, title) { } else { item['swipe_id'] = 0; item['swipes'] = []; - item['swipes'][0] = chat[chat.length - 1]['mes']; + item['swipes'][0] = chat[chat.length - 1]['mes']; } return { type, getMessage }; diff --git a/public/style.css b/public/style.css index 0d415f11d..c60b711dc 100644 --- a/public/style.css +++ b/public/style.css @@ -527,6 +527,7 @@ code { grid-column-start: 4; flex-flow: column; font-size: 30px; + cursor: pointer; } .swipe_right img, diff --git a/readme.md b/readme.md index 2a4b3ac3b..5b6a380fe 100644 --- a/readme.md +++ b/readme.md @@ -136,8 +136,8 @@ Easy to follow guide with pretty pictures: 5. Open a Command Prompt inside that folder by clicking in the 'Address Bar' at the top, typing `cmd`, and pressing Enter. 6. Once the black box (Command Prompt) pops up, type ONE of the following into it and press Enter: - * for Main Branch: `git clone -b main` - * for Dev Branch: `git clone -b dev` + * for Main Branch: `git clone https://github.com/Cohee1207/SillyTavern -b main` + * for Dev Branch: `git clone https://github.com/Cohee1207/SillyTavern -b dev` 7. Once everything is cloned, double click `Start.bat` to make NodeJS install its requirements. 8. The server will then start, and SillyTavern will popup in your browser. diff --git a/server.js b/server.js index 30688bb25..f30b3714f 100644 --- a/server.js +++ b/server.js @@ -2437,7 +2437,13 @@ app.post("/openai_bias", jsonParser, async function (request, response) { // Shamelessly stolen from Agnai app.post("/openai_usage", jsonParser, async function (request, response) { if (!request.body) return response.sendStatus(400); - const key = request.body.key; + const key = readSecret(SECRET_KEYS.OPENAI); + + if (!key) { + console.warn('Get key usage failed: Missing OpenAI API key.'); + return response.sendStatus(401); + } + const api_url = new URL(request.body.reverse_proxy || api_openai).toString(); const headers = {