Merge pull request #3572 from SillyTavern/remove-group-starter Remove group chat starter message
Signed| @@ -606,7 +606,6 @@ export const printCharactersDebounced = debounce(() => { printCharacters(false); | |||
| 606 | export const system_message_types = { | 606 | export const system_message_types = { |
| 607 | HELP: 'help', | 607 | HELP: 'help', |
| 608 | WELCOME: 'welcome', | 608 | WELCOME: 'welcome', |
| 609 | GROUP: 'group', | ||
| 610 | EMPTY: 'empty', | 609 | EMPTY: 'empty', |
| 611 | GENERIC: 'generic', | 610 | GENERIC: 'generic', |
| 612 | NARRATOR: 'narrator', | 611 | NARRATOR: 'narrator', |
| @@ -699,14 +698,6 @@ async function getSystemMessages() { | |||
| 699 | uses_system_ui: true, | 698 | uses_system_ui: true, |
| 700 | mes: await renderTemplateAsync('welcome', { displayVersion }), | 699 | mes: await renderTemplateAsync('welcome', { displayVersion }), |
| 701 | }, | 700 | }, |
| 702 | group: { | ||
| 703 | name: systemUserName, | ||
| 704 | force_avatar: system_avatar, | ||
| 705 | is_user: false, | ||
| 706 | is_system: true, | ||
| 707 | is_group: true, | ||
| 708 | mes: 'Group chat created. Say \'Hi\' to lovely people!', | ||
| 709 | }, | ||
| 710 | empty: { | 701 | empty: { |
| 711 | name: systemUserName, | 702 | name: systemUserName, |
| 712 | force_avatar: system_avatar, | 703 | force_avatar: system_avatar, |
| @@ -318,16 +318,6 @@ export async function convertSoloToGroupChat() { | |||
| 318 | const groupChat = chat.slice(); | 318 | const groupChat = chat.slice(); |
| 319 | const genIdFirst = Date.now(); | 319 | const genIdFirst = Date.now(); |
| 320 | 320 | ||
| 321 | // Add something if the chat is empty | ||
| 322 | if (groupChat.length === 0) { | ||
| 323 | const newMessage = { | ||
| 324 | ...system_messages[system_message_types.GROUP], | ||
| 325 | send_date: getMessageTimeStamp(), | ||
| 326 | extra: { type: system_message_types.GROUP }, | ||
| 327 | }; | ||
| 328 | groupChat.push(newMessage); | ||
| 329 | } | ||
| 330 | |||
| 331 | for (let index = 0; index < groupChat.length; index++) { | 321 | for (let index = 0; index < groupChat.length; index++) { |
| 332 | const message = groupChat[index]; | 322 | const message = groupChat[index]; |
| 333 | 323 | ||
| @@ -228,9 +228,6 @@ export async function getGroupChat(groupId, reload = false) { | |||
| 228 | chat.splice(0, chat.length, ...data); | 228 | chat.splice(0, chat.length, ...data); |
| 229 | await printMessages(); | 229 | await printMessages(); |
| 230 | } else { | 230 | } else { |
| 231 | sendSystemMessage(system_message_types.GROUP, '', { isSmallSys: true }); | ||
| 232 | await eventSource.emit(event_types.MESSAGE_RECEIVED, (chat.length - 1)); | ||
| 233 | await eventSource.emit(event_types.CHARACTER_MESSAGE_RENDERED, (chat.length - 1)); | ||
| 234 | if (group && Array.isArray(group.members)) { | 231 | if (group && Array.isArray(group.members)) { |
| 235 | for (let member of group.members) { | 232 | for (let member of group.members) { |
| 236 | const character = characters.find(x => x.avatar === member || x.name === member); | 233 | const character = characters.find(x => x.avatar === member || x.name === member); |