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

Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev

Browse Source
This commit is contained in:
SillyLossy
2023-05-24 16:46:10 +03:00
parent a0ef9fce83 f697663a12
commit 08df0f87e6
4 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/script.js
View File

@ -1200,6 +1200,7 @@ function addOneMessage(mes, { type = "normal", insertAfter = null, scroll = true
}
const newMessage = $(`#chat [mesid="${count_view_mes}"]`);
const isSmallSys = mes?.extra?.isSmallSys;
newMessage.data("isSystem", isSystem);
if (isSystem) {
@ -1207,6 +1208,10 @@ function addOneMessage(mes, { type = "normal", insertAfter = null, scroll = true
newMessage.find(".mes_prompt").hide(); //don't need prompt button for sys
}
if (isSmallSys === true) {
newMessage.addClass('smallSysMes');
}
// don't need prompt button for user
if (params.isUser === true) {
newMessage.find(".mes_prompt").hide();

2
public/scripts/extensions/dice/index.js
View File

@ -23,7 +23,7 @@ async function doDiceRoll() {
if (isValid) {
const result = droll.roll(value);
const context = getContext();
context.sendSystemMessage('generic', `${context.name1} rolls a ${value}. The result is: ${result.total} (${result.rolls})`);
context.sendSystemMessage('generic', `${context.name1} rolls a ${value}. The result is: ${result.total} (${result.rolls})`, { isSmallSys: true });
}
}

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

@ -145,7 +145,7 @@ export async function getGroupChat(groupId) {
}
printMessages();
} else {
sendSystemMessage(system_message_types.GROUP);
sendSystemMessage(system_message_types.GROUP, '', { isSmallSys: true });
if (group && Array.isArray(group.members)) {
for (let member of group.members) {
const character = characters.find(x => x.avatar === member || x.name === member);

25
public/style.css
View File

@ -244,6 +244,31 @@ body.tts .mes[is_system="true"] .mes_narrate {
display: none;
}
.mes.smallSysMes {
padding: 5px !important;
font-size: calc(var(--mainFontSize)* 0.9);
text-align: center;
}
.mes.smallSysMes .mes_text {
padding: 0 !important;
text-align: center;
}
.mes.smallSysMes .mes_block {
margin-right: unset !important;
}
.mes.smallSysMes .ch_name {
display: none;
}
.mes.smallSysMes .mesAvatarWrapper {
display: none;
height: unset;
min-height: unset;
}
body.sd .sd_message_gen,
body.tts .mes_narrate {
display: inline-block;