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

Support for group chat expressions

Browse Source
This commit is contained in:
SillyLossy
2023-04-14 15:13:31 +03:00
parent c44cd02a01
commit 4b98f9d825
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/script.js
View File

@ -125,6 +125,7 @@ export {
updateChatMetadata,
scrollChatToBottom,
getTokenCount,
isStreamingEnabled,
chat,
this_chid,
settings,

22
public/scripts/extensions/expressions/index.js
View File

@ -37,22 +37,22 @@ async function moduleWorker() {
continue;
}
return mes.mes;
return { mes: mes.mes, name: mes.name };
}
return '';
return { mes: '', name: null };
}
const context = getContext();
// group chats and non-characters not supported
if (context.groupId || !context.characterId) {
// non-characters not supported
if (!context.groupId && !context.characterId) {
removeExpression();
return;
}
// character changed
if (lastCharacter !== context.characterId) {
if (context.groupId !== lastCharacter && context.characterId !== lastCharacter) {
removeExpression();
validateImages();
}
@ -69,7 +69,7 @@ async function moduleWorker() {
// check if last message changed
const currentLastMessage = getLastCharacterMessage();
if (lastCharacter === context.characterId && lastMessage === currentLastMessage && $('img.expression').attr('src')) {
if (lastCharacter === context.characterId && lastMessage === currentLastMessage.mes && $('img.expression').attr('src')) {
return;
}
@ -89,13 +89,15 @@ async function moduleWorker() {
'Content-Type': 'application/json',
'Bypass-Tunnel-Reminder': 'bypass',
},
body: JSON.stringify({ text: currentLastMessage })
body: JSON.stringify({ text: currentLastMessage.mes })
});
if (apiResult.ok) {
const name = context.groupId ? currentLastMessage.name : context.name2;
const force = !!context.groupId;
const data = await apiResult.json();
const expression = data.classification[0].label;
setExpression(context.name2, expression);
setExpression(name, expression, force);
}
}
@ -104,8 +106,8 @@ async function moduleWorker() {
}
finally {
inApiCall = false;
lastCharacter = context.characterId;
lastMessage = currentLastMessage;
lastCharacter = context.groupId || context.characterId;
lastMessage = currentLastMessage.mes;
}
}

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

@ -38,6 +38,7 @@ import {
hideSwipeButtons,
chat_metadata,
updateChatMetadata,
isStreamingEnabled,
} from "../script.js";
export {
@ -291,7 +292,7 @@ async function generateGroupWrapper(by_auto_mode, type = null) {
let typingIndicator = $("#chat .typing_indicator");
if (typingIndicator.length === 0) {
if (typingIndicator.length === 0 && !isStreamingEnabled()) {
typingIndicator = $(
"#typing_indicator_template .typing_indicator"
).clone();