Merge branch 'main' into dev

This commit is contained in:
SillyLossy
2023-06-01 10:52:34 +03:00
5 changed files with 7 additions and 7 deletions

View File

@@ -516,6 +516,8 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
setCharacterId(chId);
setCharacterName(characters[chId].name)
Generate(generateType, { automatic_trigger: by_auto_mode, ...(params || {}) });
if (type !== "swipe" && type !== "impersonate" && !isMultigenEnabled() && !isStreamingEnabled()) {
// update indicator and scroll down
typingIndicator
@@ -527,8 +529,6 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
});
}
Generate(generateType, { automatic_trigger: by_auto_mode, ...(params || {}) });
// TODO: This is awful. Refactor this
while (true) {
deactivateSendButtons();