rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into staging

This commit is contained in:
Cohee 2023-09-17 16:11:27 +03:00
parent acbd01407d 938f89cd1a
commit d861c59f27
1 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/script.js
View File

@ -5145,7 +5145,8 @@ export async function getChatsFromFiles(data, isGroupChat) {
let chat_dict = {};
let chat_list = Object.values(data).sort((a, b) => a["file_name"].localeCompare(b["file_name"])).reverse();
for (const { file_name } of chat_list) {
let chat_promise = chat_list.map(({ file_name}) => {
return new Promise(async (res, rej) => {
try {
const endpoint = isGroupChat ? '/getgroupchat' : '/getchat';
const requestBody = isGroupChat
@ -5164,7 +5165,8 @@ export async function getChatsFromFiles(data, isGroupChat) {
});
if (!chatResponse.ok) {
continue;
return res();
// continue;
}
const currentChat = await chatResponse.json();
@ -5177,7 +5179,12 @@ export async function getChatsFromFiles(data, isGroupChat) {
} catch (error) {
console.error(error);
}
}
return res();
})
})
await Promise.all(chat_promise)
return chat_dict;
}