rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into timed-wi

This commit is contained in:
Cohee 2024-06-21 21:18:12 +03:00
parent 30765550c8 f2cc66d414
commit 1ede346cbc
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/script.js
View File

@ -431,7 +431,9 @@ export const event_types = {
CHARACTER_MESSAGE_RENDERED: 'character_message_rendered', CHARACTER_MESSAGE_RENDERED: 'character_message_rendered',
FORCE_SET_BACKGROUND: 'force_set_background', FORCE_SET_BACKGROUND: 'force_set_background',
CHAT_DELETED: 'chat_deleted', CHAT_DELETED: 'chat_deleted',
CHAT_CREATED: 'chat_created',
GROUP_CHAT_DELETED: 'group_chat_deleted', GROUP_CHAT_DELETED: 'group_chat_deleted',
GROUP_CHAT_CREATED: 'group_chat_created',
GENERATE_BEFORE_COMBINE_PROMPTS: 'generate_before_combine_prompts', GENERATE_BEFORE_COMBINE_PROMPTS: 'generate_before_combine_prompts',
GENERATE_AFTER_COMBINE_PROMPTS: 'generate_after_combine_prompts', GENERATE_AFTER_COMBINE_PROMPTS: 'generate_after_combine_prompts',
GROUP_MEMBER_DRAFTED: 'group_member_drafted', GROUP_MEMBER_DRAFTED: 'group_member_drafted',
@ -5884,11 +5886,13 @@ export async function getChat() {
async function getChatResult() { async function getChatResult() {
name2 = characters[this_chid].name; name2 = characters[this_chid].name;
let freshChat = false;
if (chat.length === 0) { if (chat.length === 0) {
const message = getFirstMessage(); const message = getFirstMessage();
if (message.mes) { if (message.mes) {
chat.push(message); chat.push(message);
await saveChatConditional(); await saveChatConditional();
freshChat = true;
} }
} }
await loadItemizedPrompts(getCurrentChatId()); await loadItemizedPrompts(getCurrentChatId());
@ -5896,6 +5900,7 @@ async function getChatResult() {
select_selected_character(this_chid); select_selected_character(this_chid);
await eventSource.emit(event_types.CHAT_CHANGED, (getCurrentChatId())); await eventSource.emit(event_types.CHAT_CHANGED, (getCurrentChatId()));
if (freshChat) await eventSource.emit(event_types.CHAT_CREATED);
if (chat.length === 1) { if (chat.length === 1) {
const chat_id = (chat.length - 1); const chat_id = (chat.length - 1);

3
public/scripts/group-chats.js
View File

@ -183,6 +183,7 @@ export async function getGroupChat(groupId, reload = false) {
const group = groups.find((x) => x.id === groupId); const group = groups.find((x) => x.id === groupId);
const chat_id = group.chat_id; const chat_id = group.chat_id;
const data = await loadGroupChat(chat_id); const data = await loadGroupChat(chat_id);
let freshChat = false;
await loadItemizedPrompts(getCurrentChatId()); await loadItemizedPrompts(getCurrentChatId());
@ -216,6 +217,7 @@ export async function getGroupChat(groupId, reload = false) {
} }
} }
await saveGroupChat(groupId, false); await saveGroupChat(groupId, false);
freshChat = true;
} }
if (group) { if (group) {
@ -228,6 +230,7 @@ export async function getGroupChat(groupId, reload = false) {
} }
await eventSource.emit(event_types.CHAT_CHANGED, getCurrentChatId()); await eventSource.emit(event_types.CHAT_CHANGED, getCurrentChatId());
if (freshChat) await eventSource.emit(event_types.GROUP_CHAT_CREATED);
} }
/** /**

6
src/endpoints/search.js
View File

@ -34,6 +34,8 @@ router.post('/serpapi', jsonParser, async (request, response) => {
const { query } = request.body; const { query } = request.body;
const result = await fetch(`https://serpapi.com/search.json?q=${encodeURIComponent(query)}&api_key=${key}`); const result = await fetch(`https://serpapi.com/search.json?q=${encodeURIComponent(query)}&api_key=${key}`);
console.log('SerpApi query', query);
if (!result.ok) { if (!result.ok) {
const text = await result.text(); const text = await result.text();
console.log('SerpApi request failed', result.statusText, text); console.log('SerpApi request failed', result.statusText, text);
@ -143,6 +145,8 @@ router.post('/searxng', jsonParser, async (request, response) => {
return response.sendStatus(400); return response.sendStatus(400);
} }
console.log('SearXNG query', baseUrl, query);
const url = new URL(baseUrl); const url = new URL(baseUrl);
const params = new URLSearchParams(); const params = new URLSearchParams();
params.append('q', query); params.append('q', query);
@ -205,6 +209,8 @@ router.post('/visit', jsonParser, async (request, response) => {
return response.sendStatus(400); return response.sendStatus(400);
} }
console.log('Visiting web URL', url);
const result = await fetch(url, { headers: visitHeaders }); const result = await fetch(url, { headers: visitHeaders });
if (!result.ok) { if (!result.ok) {