mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] reroll problem

Browse Source
This commit is contained in:
kwaroran
2023-08-17 17:13:47 +09:00
parent 4a66a585f7
commit c944e780ac
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/lib/ChatScreens/DefaultChatScreen.svelte
View File

@@ -111,16 +111,21 @@
if(Array.isArray(rerolls[rerollid + 1])){ if(Array.isArray(rerolls[rerollid + 1])){
let db = $DataBase let db = $DataBase
rerollid += 1 rerollid += 1
db.characters[$selectedCharID].chats[$CurrentCharacter.chatPage].message = cloneDeep(rerolls[rerollid]) let rerollData = cloneDeep(rerolls[rerollid])
let msgs = db.characters[$selectedCharID].chats[$CurrentCharacter.chatPage].message
for(let i = 0; i < rerollData.length; i++){
msgs[msgs.length - rerollData.length + i] = rerollData[i]
}
db.characters[$selectedCharID].chats[$CurrentCharacter.chatPage].message = msgs
$DataBase = db $DataBase = db
} }
return return
} }
if(rerolls.length === 0){ if(rerolls.length === 0){
rerolls.push($CurrentChat.message) rerolls.push(cloneDeep([$CurrentChat.message.at(-1)]))
rerollid = rerolls.length - 1 rerollid = rerolls.length - 1
} }
let cha = $CurrentChat.message let cha = cloneDeep($CurrentChat.message)
if(cha.length === 0 ){ if(cha.length === 0 ){
return return
} }
@@ -134,7 +139,10 @@
break break
} }
} }
cha.pop() let msg = cha.pop()
if(!msg){
return
}
} }
$CurrentChat.message = cha $CurrentChat.message = cha
await sendChatMain() await sendChatMain()
@@ -154,7 +162,12 @@
if(Array.isArray(rerolls[rerollid - 1])){ if(Array.isArray(rerolls[rerollid - 1])){
let db = $DataBase let db = $DataBase
rerollid -= 1 rerollid -= 1
db.characters[$selectedCharID].chats[$CurrentCharacter.chatPage].message = cloneDeep(rerolls[rerollid]) let rerollData = cloneDeep(rerolls[rerollid])
let msgs = db.characters[$selectedCharID].chats[$CurrentCharacter.chatPage].message
for(let i = 0; i < rerollData.length; i++){
msgs[msgs.length - rerollData.length + i] = rerollData[i]
}
db.characters[$selectedCharID].chats[$CurrentCharacter.chatPage].message = msgs
$DataBase = db $DataBase = db
} }
} }
@@ -162,19 +175,23 @@
let abortController:null|AbortController = null let abortController:null|AbortController = null
async function sendChatMain(continued:boolean = false) { async function sendChatMain(continued:boolean = false) {
let previousLength = $CurrentChat.message.length
messageInput = '' messageInput = ''
abortController = new AbortController() abortController = new AbortController()
try { try {
await sendChat(-1, { await sendChat(-1, {
signal:abortController.signal, signal:abortController.signal,
continue:continued continue:continued
}) })
if(previousLength < $CurrentChat.message.length){
rerolls.push(cloneDeep($CurrentChat.message).slice(previousLength))
rerollid = rerolls.length - 1
}
} catch (error) { } catch (error) {
console.error(error) console.error(error)
alertError(`${error}`) alertError(`${error}`)
} }
rerolls.push(cloneDeep($CurrentChat.message))
rerollid = rerolls.length - 1
lastCharId = $selectedCharID lastCharId = $selectedCharID
$doingChat = false $doingChat = false
if($DataBase.playMessage){ if($DataBase.playMessage){