From a10ee2e7a6cb9732a591faf1d810b556121961a6 Mon Sep 17 00:00:00 2001 From: phyyou Date: Sat, 13 May 2023 01:58:14 +0900 Subject: [PATCH 1/3] feat(sidebar-avatar): Creat SidebarIndicator & Refactor Sidebar UI * Add SidebarIndicator * Remove BarIcon components at Character at Bar * It replaced by SidebarAvatar component * (TODO: Refactor BarIcon to UI Components & Sidebar State Flow) * Refactor getCharImage * Delete unused code BREAKING CHANGE: --- src/lib/SideBars/BarIcon.svelte | 70 +- src/lib/SideBars/Sidebar.svelte | 436 ++++++----- src/lib/SideBars/SidebarAvatar.svelte | 24 + src/lib/SideBars/SidebarIndicator.svelte | 17 + src/ts/characters.ts | 890 ++++++++++++----------- 5 files changed, 798 insertions(+), 639 deletions(-) create mode 100644 src/lib/SideBars/SidebarAvatar.svelte create mode 100644 src/lib/SideBars/SidebarIndicator.svelte diff --git a/src/lib/SideBars/BarIcon.svelte b/src/lib/SideBars/BarIcon.svelte index b9ea837b..53340c39 100644 --- a/src/lib/SideBars/BarIcon.svelte +++ b/src/lib/SideBars/BarIcon.svelte @@ -1,36 +1,42 @@ + + + {#await additionalStyle} - -{:then as} - + +{:then as} + {/await} - - \ No newline at end of file + diff --git a/src/lib/SideBars/Sidebar.svelte b/src/lib/SideBars/Sidebar.svelte index 15ddf339..1569117d 100644 --- a/src/lib/SideBars/Sidebar.svelte +++ b/src/lib/SideBars/Sidebar.svelte @@ -1,189 +1,273 @@ -
- -
- {#if menuMode === 0} + +
+ +
+ {#if menuMode === 0} {#each charImages as charimg, i} -
- {#if charimg !== ''} - {changeChar(i)}} additionalStyle={getCharImage($DataBase.characters[i].image, 'css')}> - - {:else} - {changeChar(i)}} additionalStyle={i === $selectedCharID ? 'background:#44475a' : ''}> - - - {/if} - {#if editMode} -
- - -
- {/if} -
- {/each} - { - if(sideBarMode === 1){ - reseter(); - sideBarMode = 0 - } - else{ - reseter(); - sideBarMode = 1 - } - }}> - {:else} - { - if($settingsOpen){ - reseter(); - settingsOpen.set(false) - } - else{ - reseter(); - settingsOpen.set(true) - } - }}> - { - reseter(); - openGrid() - }}> - {/if} -
-
1000)}> - - - {#if sideBarMode === 0} - {#if $selectedCharID < 0 || $settingsOpen} - +
+ + {#if charimg !== ""} + +
{ + changeChar(i); + }} + on:keydown={(e) => { + if (e.key === "Enter") { + changeChar(i); + } + }} + tabindex="0" + > + {#await getCharImage($DataBase.characters[i].image, "plain") then img} + + {:catch} + + {/await} +
{:else} - + +
{ + changeChar(i); + }} + on:keydown={(e) => { + if (e.key === "Enter") { + changeChar(i); + } + }} + tabindex="0" + > + +
{/if} - {:else if sideBarMode === 1} -

Create

- - - -

Edit

- - {/if} + {#if editMode} +
+ + +
+ {/if} +
+ {/each} + { + if (sideBarMode === 1) { + reseter(); + sideBarMode = 0; + } else { + reseter(); + sideBarMode = 1; + } + }}> + {:else} + { + if ($settingsOpen) { + reseter(); + settingsOpen.set(false); + } else { + reseter(); + settingsOpen.set(true); + } + }}> + { + reseter(); + openGrid(); + }}> + {/if} +
+
1000} +> + + + {#if sideBarMode === 0} + {#if $selectedCharID < 0 || $settingsOpen} + + {:else} + + {/if} + {:else if sideBarMode === 1} +

Create

+ + + +

Edit

+ + {/if}
- - {#if openPresetList} - {openPresetList = false}}/> -{/if} \ No newline at end of file + { + openPresetList = false; + }} + /> +{/if} + + diff --git a/src/lib/SideBars/SidebarAvatar.svelte b/src/lib/SideBars/SidebarAvatar.svelte new file mode 100644 index 00000000..ea7bf8b2 --- /dev/null +++ b/src/lib/SideBars/SidebarAvatar.svelte @@ -0,0 +1,24 @@ + + + + {#if src} + avatar + {:else} +
+ {/if} + diff --git a/src/lib/SideBars/SidebarIndicator.svelte b/src/lib/SideBars/SidebarIndicator.svelte new file mode 100644 index 00000000..157dae98 --- /dev/null +++ b/src/lib/SideBars/SidebarIndicator.svelte @@ -0,0 +1,17 @@ + + +
diff --git a/src/ts/characters.ts b/src/ts/characters.ts index 5cc19592..045a2d6a 100644 --- a/src/ts/characters.ts +++ b/src/ts/characters.ts @@ -1,471 +1,499 @@ import { get, writable } from "svelte/store"; -import { DataBase, saveImage, setDatabase, type character, type Chat, defaultSdDataFunc } from "./database"; -import exifr from 'exifr' -import { alertConfirm, alertError, alertNormal, alertSelect, alertStore } from "./alert"; +import { + DataBase, + saveImage, + setDatabase, + type character, + type Chat, + defaultSdDataFunc, +} from "./database"; +import exifr from "exifr"; +import { + alertConfirm, + alertError, + alertNormal, + alertSelect, + alertStore, +} from "./alert"; import { language } from "../lang"; import { PngMetadata } from "./exif"; -import { encode as encodeMsgpack, decode as decodeMsgpack } from "@msgpack/msgpack"; -import { checkNullish, findCharacterbyId, selectMultipleFile, selectSingleFile, sleep } from "./util"; -import { v4 as uuidv4 } from 'uuid'; +import { + encode as encodeMsgpack, + decode as decodeMsgpack, +} from "@msgpack/msgpack"; +import { + checkNullish, + findCharacterbyId, + selectMultipleFile, + selectSingleFile, + sleep, +} from "./util"; +import { v4 as uuidv4 } from "uuid"; import { selectedCharID } from "./stores"; import { downloadFile, getFileSrc, readImage } from "./globalApi"; export function createNewCharacter() { - let db = get(DataBase) - db.characters.push(createBlankChar()) - setDatabase(db) - return db.characters.length - 1 + let db = get(DataBase); + db.characters.push(createBlankChar()); + setDatabase(db); + return db.characters.length - 1; } -export function createNewGroup(){ - let db = get(DataBase) - db.characters.push({ - type: 'group', - name: "", - firstMessage: "", - chats: [{ - message: [], - note: '', - name: 'Chat 1', - localLore: [] - }], chatPage: 0, - viewScreen: 'none', - globalLore: [], - characters: [], - autoMode: false, - useCharacterLore: true, - emotionImages: [], - customscript: [], - chaId: uuidv4(), - firstMsgIndex: -1 - }) - setDatabase(db) - return db.characters.length - 1 +export function createNewGroup() { + let db = get(DataBase); + db.characters.push({ + type: "group", + name: "", + firstMessage: "", + chats: [ + { + message: [], + note: "", + name: "Chat 1", + localLore: [], + }, + ], + chatPage: 0, + viewScreen: "none", + globalLore: [], + characters: [], + autoMode: false, + useCharacterLore: true, + emotionImages: [], + customscript: [], + chaId: uuidv4(), + firstMsgIndex: -1, + }); + setDatabase(db); + return db.characters.length - 1; } -export async function getCharImage(loc:string, type:'plain'|'css'|'contain') { - if(!loc || loc === ''){ - if(type ==='css'){ - return '' - } - return null - } - const filesrc = await getFileSrc(loc) - if(type === 'plain'){ - return filesrc - } - else if(type ==='css'){ - return `background: url("${filesrc}");background-size: cover;` - } - else{ - return `background: url("${filesrc}");background-size: contain;background-repeat: no-repeat;background-position: center;` - } +export async function getCharImage( + loc: string, + type: "plain" | "css" | "contain" // TODO: REFACTOR BY REMOVE THIS PARAMETER +) { + const filesrc = await getFileSrc(loc); + return filesrc; } -export async function selectCharImg(charId:number) { - const selected = await selectSingleFile(['png']) - if(!selected){ - return - } - const img = selected.data - let db = get(DataBase) - const imgp = await saveImage(img) - db.characters[charId].image = imgp - setDatabase(db) +export async function selectCharImg(charId: number) { + const selected = await selectSingleFile(["png"]); + if (!selected) { + return; + } + const img = selected.data; + let db = get(DataBase); + const imgp = await saveImage(img); + db.characters[charId].image = imgp; + setDatabase(db); } export async function selectUserImg() { - const selected = await selectSingleFile(['png']) - if(!selected){ - return - } - const img = selected.data - let db = get(DataBase) - const imgp = await saveImage(img) - db.userIcon = imgp - setDatabase(db) + const selected = await selectSingleFile(["png"]); + if (!selected) { + return; + } + const img = selected.data; + let db = get(DataBase); + const imgp = await saveImage(img); + db.userIcon = imgp; + setDatabase(db); } -export const addingEmotion = writable(false) +export const addingEmotion = writable(false); -export async function addCharEmotion(charId:number) { - addingEmotion.set(true) - const selected = await selectMultipleFile(['png', 'webp', 'gif']) - if(!selected){ - addingEmotion.set(false) - return +export async function addCharEmotion(charId: number) { + addingEmotion.set(true); + const selected = await selectMultipleFile(["png", "webp", "gif"]); + if (!selected) { + addingEmotion.set(false); + return; + } + let db = get(DataBase); + for (const f of selected) { + console.log(f); + const img = f.data; + const imgp = await saveImage(img); + const name = f.name.replace(".png", "").replace(".webp", ""); + let dbChar = db.characters[charId]; + if (dbChar.type !== "group") { + dbChar.emotionImages.push([name, imgp]); + db.characters[charId] = dbChar; } - let db = get(DataBase) - for(const f of selected){ - console.log(f) - const img = f.data - const imgp = await saveImage(img) - const name = f.name.replace('.png','').replace('.webp','') - let dbChar = db.characters[charId] - if(dbChar.type !== 'group'){ - dbChar.emotionImages.push([name,imgp]) - db.characters[charId] = dbChar - } - setDatabase(db) - } - addingEmotion.set(false) + setDatabase(db); + } + addingEmotion.set(false); } -export async function rmCharEmotion(charId:number, emotionId:number) { - let db = get(DataBase) - let dbChar = db.characters[charId] - if(dbChar.type !== 'group'){ - dbChar.emotionImages.splice(emotionId, 1) - db.characters[charId] = dbChar - } - setDatabase(db) +export async function rmCharEmotion(charId: number, emotionId: number) { + let db = get(DataBase); + let dbChar = db.characters[charId]; + if (dbChar.type !== "group") { + dbChar.emotionImages.splice(emotionId, 1); + db.characters[charId] = dbChar; + } + setDatabase(db); } +export async function exportChat(page: number) { + try { + const mode = await alertSelect(["Export as JSON", "Export as TXT"]); + const selectedID = get(selectedCharID); + const db = get(DataBase); + const chat = db.characters[selectedID].chats[page]; + const char = db.characters[selectedID]; + const date = new Date().toJSON(); + console.log(mode); + if (mode === "0") { + const stringl = Buffer.from( + JSON.stringify({ + type: "risuChat", + ver: 1, + data: chat, + }), + "utf-8" + ); -export async function exportChat(page:number){ - try { - - const mode = await alertSelect(['Export as JSON', "Export as TXT"]) - const selectedID = get(selectedCharID) - const db = get(DataBase) - const chat = db.characters[selectedID].chats[page] - const char = db.characters[selectedID] - const date = new Date().toJSON(); - console.log(mode) - if(mode === '0'){ - const stringl = Buffer.from(JSON.stringify({ - type: 'risuChat', - ver: 1, - data: chat - }), 'utf-8') - - await downloadFile(`${char.name}_${date}_chat`.replace(/[<>:"/\\|?*\.\,]/g, "") + '.json', stringl) - - } - else{ - - let stringl = chat.message.map((v) => { - if(v.saying){ - return `${findCharacterbyId(v.saying).name}\n${v.data}` - } - else{ - return `${v.role === 'char' ? char.name : db.username}\n${v.data}` - } - }).join('\n\n') - - if(char.type !== 'group'){ - stringl = `${char.name}\n${char.firstMessage}\n\n` + stringl - } - - await downloadFile(`${char.name}_${date}_chat`.replace(/[<>:"/\\|?*\.\,]/g, "") + '.txt', Buffer.from(stringl, 'utf-8')) - - } - alertNormal(language.successExport) - } catch (error) { - alertError(`${error}`) - } -} - -export async function importChat(){ - const dat =await selectSingleFile(['json','jsonl']) - if(!dat){ - return - } - try { - const selectedID = get(selectedCharID) - let db = get(DataBase) - - if(dat.name.endsWith('jsonl')){ - const lines = Buffer.from(dat.data).toString('utf-8').split('\n') - let newChat:Chat = { - message: [], - note: "", - name: "Imported Chat", - localLore: [] - } - - let isFirst = true - for(const line of lines){ - - const presedLine = JSON.parse(line) - if(presedLine.name && presedLine.is_user, presedLine.mes){ - if(!isFirst){ - newChat.message.push({ - role: presedLine.is_user ? "user" : 'char', - data: formatTavernChat(presedLine.mes, db.characters[selectedID].name) - }) - } - } - - isFirst = false - } - - if(newChat.message.length === 0){ - alertError(language.errors.noData) - return - } - - db.characters[selectedID].chats.push(newChat) - setDatabase(db) - alertNormal(language.successImport) - } - else{ - const json = JSON.parse(Buffer.from(dat.data).toString('utf-8')) - if(json.type === 'risuChat' && json.ver === 1){ - const das:Chat = json.data - if(!(checkNullish(das.message) || checkNullish(das.note) || checkNullish(das.name) || checkNullish(das.localLore))){ - db.characters[selectedID].chats.push(das) - setDatabase(db) - alertNormal(language.successImport) - return - } - else{ - alertError(language.errors.noData) - return - } - } - else{ - alertError(language.errors.noData) - return - } - } - - } catch (error) { - alertError(`${error}`) - } -} - -function formatTavernChat(chat:string, charName:string){ - const db = get(DataBase) - return chat.replace(/<([Uu]ser)>|\{\{([Uu]ser)\}\}/g, db.username).replace(/((\{\{)|<)([Cc]har)(=.+)?((\}\})|>)/g, charName) -} - -export function characterFormatUpdate(index:number|character){ - let db = get(DataBase) - let cha = typeof(index) === 'number' ? db.characters[index] : index - if(cha.chats.length === 0){ - cha.chats = [{ - message: [], - note: '', - name: 'Chat 1', - localLore: [] - }] - } - if(!cha.chats[cha.chatPage]){ - cha.chatPage = 0 - } - if(!cha.chats[cha.chatPage].message){ - cha.chats[cha.chatPage].message = [] - } - if(!cha.type){ - cha.type = 'character' - } - if(!cha.chaId){ - cha.chaId = uuidv4() - } - if(cha.type !== 'group'){ - if(checkNullish(cha.sdData)){ - cha.sdData = defaultSdDataFunc() - } - if(checkNullish(cha.utilityBot)){ - cha.utilityBot = false - } - cha.alternateGreetings = cha.alternateGreetings ?? [] - cha.exampleMessage = cha.exampleMessage ?? '' - cha.creatorNotes = cha.creatorNotes ?? '' - cha.systemPrompt = cha.systemPrompt ?? '' - cha.postHistoryInstructions = cha.postHistoryInstructions ?? '' - cha.tags = cha.tags ?? [] - cha.creator = cha.creator ?? '' - cha.characterVersion = cha.characterVersion ?? 0 - cha.personality = cha.personality ?? '' - cha.scenario = cha.scenario ?? '' - cha.firstMsgIndex = cha.firstMsgIndex ?? -1 - - } - if(checkNullish(cha.customscript)){ - cha.customscript = [] - } - if(typeof(index) === 'number'){ - db.characters[index] = cha - setDatabase(db) - } - return cha -} - - -export function createBlankChar():character{ - return { - name: '', - firstMessage: '', - desc: '', - notes: '', - chats: [{ - message: [], - note: '', - name: 'Chat 1', - localLore: [] - }], - chatPage: 0, - emotionImages: [], - bias: [], - viewScreen: 'none', - globalLore: [], - chaId: uuidv4(), - type: 'character', - sdData: defaultSdDataFunc(), - utilityBot: false, - customscript: [], - exampleMessage: '', - creatorNotes:'', - systemPrompt:'', - postHistoryInstructions:'', - alternateGreetings:[], - tags:[], - creator:"", - characterVersion: 0, - personality:"", - scenario:"", - firstMsgIndex: -1 - } -} - - -export async function makeGroupImage() { - try { - alertStore.set({ - type: 'wait', - msg: `Loading..` + await downloadFile( + `${char.name}_${date}_chat`.replace(/[<>:"/\\|?*\.\,]/g, "") + ".json", + stringl + ); + } else { + let stringl = chat.message + .map((v) => { + if (v.saying) { + return `${findCharacterbyId(v.saying).name}\n${v.data}`; + } else { + return `${v.role === "char" ? char.name : db.username}\n${v.data}`; + } }) - const db = get(DataBase) - const charID = get(selectedCharID) - const group = db.characters[charID] - if(group.type !== 'group'){ - return - } - - const imageUrls = await Promise.all(group.characters.map((v) => { - return getCharImage(findCharacterbyId(v).image, 'plain') - })) - - - - const canvas = document.createElement("canvas"); - canvas.width = 256 - canvas.height = 256 - const ctx = canvas.getContext("2d"); - - // Load the images - const images = []; - let loadedImages = 0; - - await Promise.all( - imageUrls.map( - (url) => - new Promise((resolve) => { - const img = new Image(); - img.crossOrigin="anonymous" - img.onload = () => { - images.push(img); - resolve(); - }; - img.src = url; - }) - ) - ); - - // Calculate dimensions and draw the grid - const numImages = images.length; - const numCols = Math.ceil(Math.sqrt(images.length)); - const numRows = Math.ceil(images.length / numCols); - const cellWidth = canvas.width / numCols; - const cellHeight = canvas.height / numRows; - - for (let row = 0; row < numRows; row++) { - for (let col = 0; col < numCols; col++) { - const index = row * numCols + col; - if (index >= numImages) break; - ctx.drawImage( - images[index], - col * cellWidth, - row * cellHeight, - cellWidth, - cellHeight - ); + .join("\n\n"); + + if (char.type !== "group") { + stringl = `${char.name}\n${char.firstMessage}\n\n` + stringl; + } + + await downloadFile( + `${char.name}_${date}_chat`.replace(/[<>:"/\\|?*\.\,]/g, "") + ".txt", + Buffer.from(stringl, "utf-8") + ); + } + alertNormal(language.successExport); + } catch (error) { + alertError(`${error}`); + } +} + +export async function importChat() { + const dat = await selectSingleFile(["json", "jsonl"]); + if (!dat) { + return; + } + try { + const selectedID = get(selectedCharID); + let db = get(DataBase); + + if (dat.name.endsWith("jsonl")) { + const lines = Buffer.from(dat.data).toString("utf-8").split("\n"); + let newChat: Chat = { + message: [], + note: "", + name: "Imported Chat", + localLore: [], + }; + + let isFirst = true; + for (const line of lines) { + const presedLine = JSON.parse(line); + if ((presedLine.name && presedLine.is_user, presedLine.mes)) { + if (!isFirst) { + newChat.message.push({ + role: presedLine.is_user ? "user" : "char", + data: formatTavernChat( + presedLine.mes, + db.characters[selectedID].name + ), + }); } } - - // Return the image URI - - const uri = canvas.toDataURL() - console.log(uri) - canvas.remove() - db.characters[charID].image = await saveImage(dataURLtoBuffer(uri)); - setDatabase(db) - alertStore.set({ - type: 'none', - msg: '' - }) - } catch (error) { - alertError(`${error}`) + + isFirst = false; + } + + if (newChat.message.length === 0) { + alertError(language.errors.noData); + return; + } + + db.characters[selectedID].chats.push(newChat); + setDatabase(db); + alertNormal(language.successImport); + } else { + const json = JSON.parse(Buffer.from(dat.data).toString("utf-8")); + if (json.type === "risuChat" && json.ver === 1) { + const das: Chat = json.data; + if ( + !( + checkNullish(das.message) || + checkNullish(das.note) || + checkNullish(das.name) || + checkNullish(das.localLore) + ) + ) { + db.characters[selectedID].chats.push(das); + setDatabase(db); + alertNormal(language.successImport); + return; + } else { + alertError(language.errors.noData); + return; + } + } else { + alertError(language.errors.noData); + return; + } } + } catch (error) { + alertError(`${error}`); + } } -function dataURLtoBuffer(string:string){ - const regex = /^data:.+\/(.+);base64,(.*)$/; +function formatTavernChat(chat: string, charName: string) { + const db = get(DataBase); + return chat + .replace(/<([Uu]ser)>|\{\{([Uu]ser)\}\}/g, db.username) + .replace(/((\{\{)|<)([Cc]har)(=.+)?((\}\})|>)/g, charName); +} - const matches = string.match(regex); - const ext = matches[1]; - const data = matches[2]; - return Buffer.from(data, 'base64'); +export function characterFormatUpdate(index: number | character) { + let db = get(DataBase); + let cha = typeof index === "number" ? db.characters[index] : index; + if (cha.chats.length === 0) { + cha.chats = [ + { + message: [], + note: "", + name: "Chat 1", + localLore: [], + }, + ]; + } + if (!cha.chats[cha.chatPage]) { + cha.chatPage = 0; + } + if (!cha.chats[cha.chatPage].message) { + cha.chats[cha.chatPage].message = []; + } + if (!cha.type) { + cha.type = "character"; + } + if (!cha.chaId) { + cha.chaId = uuidv4(); + } + if (cha.type !== "group") { + if (checkNullish(cha.sdData)) { + cha.sdData = defaultSdDataFunc(); + } + if (checkNullish(cha.utilityBot)) { + cha.utilityBot = false; + } + cha.alternateGreetings = cha.alternateGreetings ?? []; + cha.exampleMessage = cha.exampleMessage ?? ""; + cha.creatorNotes = cha.creatorNotes ?? ""; + cha.systemPrompt = cha.systemPrompt ?? ""; + cha.postHistoryInstructions = cha.postHistoryInstructions ?? ""; + cha.tags = cha.tags ?? []; + cha.creator = cha.creator ?? ""; + cha.characterVersion = cha.characterVersion ?? 0; + cha.personality = cha.personality ?? ""; + cha.scenario = cha.scenario ?? ""; + cha.firstMsgIndex = cha.firstMsgIndex ?? -1; + } + if (checkNullish(cha.customscript)) { + cha.customscript = []; + } + if (typeof index === "number") { + db.characters[index] = cha; + setDatabase(db); + } + return cha; +} + +export function createBlankChar(): character { + return { + name: "", + firstMessage: "", + desc: "", + notes: "", + chats: [ + { + message: [], + note: "", + name: "Chat 1", + localLore: [], + }, + ], + chatPage: 0, + emotionImages: [], + bias: [], + viewScreen: "none", + globalLore: [], + chaId: uuidv4(), + type: "character", + sdData: defaultSdDataFunc(), + utilityBot: false, + customscript: [], + exampleMessage: "", + creatorNotes: "", + systemPrompt: "", + postHistoryInstructions: "", + alternateGreetings: [], + tags: [], + creator: "", + characterVersion: 0, + personality: "", + scenario: "", + firstMsgIndex: -1, + }; +} + +export async function makeGroupImage() { + try { + alertStore.set({ + type: "wait", + msg: `Loading..`, + }); + const db = get(DataBase); + const charID = get(selectedCharID); + const group = db.characters[charID]; + if (group.type !== "group") { + return; + } + + const imageUrls = await Promise.all( + group.characters.map((v) => { + return getCharImage(findCharacterbyId(v).image, "plain"); + }) + ); + + const canvas = document.createElement("canvas"); + canvas.width = 256; + canvas.height = 256; + const ctx = canvas.getContext("2d"); + + // Load the images + const images = []; + let loadedImages = 0; + + await Promise.all( + imageUrls.map( + (url) => + new Promise((resolve) => { + const img = new Image(); + img.crossOrigin = "anonymous"; + img.onload = () => { + images.push(img); + resolve(); + }; + img.src = url; + }) + ) + ); + + // Calculate dimensions and draw the grid + const numImages = images.length; + const numCols = Math.ceil(Math.sqrt(images.length)); + const numRows = Math.ceil(images.length / numCols); + const cellWidth = canvas.width / numCols; + const cellHeight = canvas.height / numRows; + + for (let row = 0; row < numRows; row++) { + for (let col = 0; col < numCols; col++) { + const index = row * numCols + col; + if (index >= numImages) break; + ctx.drawImage( + images[index], + col * cellWidth, + row * cellHeight, + cellWidth, + cellHeight + ); + } + } + + // Return the image URI + + const uri = canvas.toDataURL(); + console.log(uri); + canvas.remove(); + db.characters[charID].image = await saveImage(dataURLtoBuffer(uri)); + setDatabase(db); + alertStore.set({ + type: "none", + msg: "", + }); + } catch (error) { + alertError(`${error}`); + } +} + +function dataURLtoBuffer(string: string) { + const regex = /^data:.+\/(.+);base64,(.*)$/; + + const matches = string.match(regex); + const ext = matches[1]; + const data = matches[2]; + return Buffer.from(data, "base64"); } export async function addDefaultCharacters() { - const imgs = [fetch('/sample/rika.png'),fetch('/sample/yuzu.png')] + const imgs = [fetch("/sample/rika.png"), fetch("/sample/yuzu.png")]; - alertStore.set({ - type: 'wait', - msg: `Loading Sample bots...` - }) + alertStore.set({ + type: "wait", + msg: `Loading Sample bots...`, + }); - for(const img of imgs){ - const imgBuffer = await (await img).arrayBuffer() - const readed = (await exifr.parse(imgBuffer, true)) - await sleep(10) - const va = decodeMsgpack(Buffer.from(readed.risuai, 'base64')) as any - if(va.type !== 101){ - alertError(language.errors.noData) - return - } - let char:character = va.data - let db = get(DataBase) - if(char.emotionImages && char.emotionImages.length > 0){ - for(let i=0;i 0) { + for (let i = 0; i < char.emotionImages.length; i++) { + await sleep(10); + const imgp = await saveImage(char.emotionImages[i][1] as any); + char.emotionImages[i][1] = imgp; + } + } + char.chats = [ + { + message: [], + note: "", + name: "Chat 1", + localLore: [], + }, + ]; - if(checkNullish(char.sdData)){ - char.sdData = defaultSdDataFunc() - } - - char.chatPage = 0 - char.image = await saveImage(PngMetadata.filter(Buffer.from(imgBuffer))) - char.chaId = uuidv4() - db.characters.push(characterFormatUpdate(char)) - setDatabase(db) + if (checkNullish(char.sdData)) { + char.sdData = defaultSdDataFunc(); } - alertStore.set({ - type: 'none', - msg: '' - }) -} \ No newline at end of file + char.chatPage = 0; + char.image = await saveImage(PngMetadata.filter(Buffer.from(imgBuffer))); + char.chaId = uuidv4(); + db.characters.push(characterFormatUpdate(char)); + setDatabase(db); + } + + alertStore.set({ + type: "none", + msg: "", + }); +} From 8e6ac84c3b9b33b3617a2d8ec98cb6a18e739439 Mon Sep 17 00:00:00 2001 From: phyyou Date: Sat, 13 May 2023 02:47:55 +0900 Subject: [PATCH 2/3] revert: Revert Refactor function getCharImage --- src/ts/characters.ts | 870 +++++++++++++++++++++---------------------- 1 file changed, 421 insertions(+), 449 deletions(-) diff --git a/src/ts/characters.ts b/src/ts/characters.ts index 045a2d6a..5cc19592 100644 --- a/src/ts/characters.ts +++ b/src/ts/characters.ts @@ -1,499 +1,471 @@ import { get, writable } from "svelte/store"; -import { - DataBase, - saveImage, - setDatabase, - type character, - type Chat, - defaultSdDataFunc, -} from "./database"; -import exifr from "exifr"; -import { - alertConfirm, - alertError, - alertNormal, - alertSelect, - alertStore, -} from "./alert"; +import { DataBase, saveImage, setDatabase, type character, type Chat, defaultSdDataFunc } from "./database"; +import exifr from 'exifr' +import { alertConfirm, alertError, alertNormal, alertSelect, alertStore } from "./alert"; import { language } from "../lang"; import { PngMetadata } from "./exif"; -import { - encode as encodeMsgpack, - decode as decodeMsgpack, -} from "@msgpack/msgpack"; -import { - checkNullish, - findCharacterbyId, - selectMultipleFile, - selectSingleFile, - sleep, -} from "./util"; -import { v4 as uuidv4 } from "uuid"; +import { encode as encodeMsgpack, decode as decodeMsgpack } from "@msgpack/msgpack"; +import { checkNullish, findCharacterbyId, selectMultipleFile, selectSingleFile, sleep } from "./util"; +import { v4 as uuidv4 } from 'uuid'; import { selectedCharID } from "./stores"; import { downloadFile, getFileSrc, readImage } from "./globalApi"; export function createNewCharacter() { - let db = get(DataBase); - db.characters.push(createBlankChar()); - setDatabase(db); - return db.characters.length - 1; + let db = get(DataBase) + db.characters.push(createBlankChar()) + setDatabase(db) + return db.characters.length - 1 } -export function createNewGroup() { - let db = get(DataBase); - db.characters.push({ - type: "group", - name: "", - firstMessage: "", - chats: [ - { - message: [], - note: "", - name: "Chat 1", - localLore: [], - }, - ], - chatPage: 0, - viewScreen: "none", - globalLore: [], - characters: [], - autoMode: false, - useCharacterLore: true, - emotionImages: [], - customscript: [], - chaId: uuidv4(), - firstMsgIndex: -1, - }); - setDatabase(db); - return db.characters.length - 1; +export function createNewGroup(){ + let db = get(DataBase) + db.characters.push({ + type: 'group', + name: "", + firstMessage: "", + chats: [{ + message: [], + note: '', + name: 'Chat 1', + localLore: [] + }], chatPage: 0, + viewScreen: 'none', + globalLore: [], + characters: [], + autoMode: false, + useCharacterLore: true, + emotionImages: [], + customscript: [], + chaId: uuidv4(), + firstMsgIndex: -1 + }) + setDatabase(db) + return db.characters.length - 1 } -export async function getCharImage( - loc: string, - type: "plain" | "css" | "contain" // TODO: REFACTOR BY REMOVE THIS PARAMETER -) { - const filesrc = await getFileSrc(loc); - return filesrc; +export async function getCharImage(loc:string, type:'plain'|'css'|'contain') { + if(!loc || loc === ''){ + if(type ==='css'){ + return '' + } + return null + } + const filesrc = await getFileSrc(loc) + if(type === 'plain'){ + return filesrc + } + else if(type ==='css'){ + return `background: url("${filesrc}");background-size: cover;` + } + else{ + return `background: url("${filesrc}");background-size: contain;background-repeat: no-repeat;background-position: center;` + } } -export async function selectCharImg(charId: number) { - const selected = await selectSingleFile(["png"]); - if (!selected) { - return; - } - const img = selected.data; - let db = get(DataBase); - const imgp = await saveImage(img); - db.characters[charId].image = imgp; - setDatabase(db); +export async function selectCharImg(charId:number) { + const selected = await selectSingleFile(['png']) + if(!selected){ + return + } + const img = selected.data + let db = get(DataBase) + const imgp = await saveImage(img) + db.characters[charId].image = imgp + setDatabase(db) } export async function selectUserImg() { - const selected = await selectSingleFile(["png"]); - if (!selected) { - return; - } - const img = selected.data; - let db = get(DataBase); - const imgp = await saveImage(img); - db.userIcon = imgp; - setDatabase(db); -} - -export const addingEmotion = writable(false); - -export async function addCharEmotion(charId: number) { - addingEmotion.set(true); - const selected = await selectMultipleFile(["png", "webp", "gif"]); - if (!selected) { - addingEmotion.set(false); - return; - } - let db = get(DataBase); - for (const f of selected) { - console.log(f); - const img = f.data; - const imgp = await saveImage(img); - const name = f.name.replace(".png", "").replace(".webp", ""); - let dbChar = db.characters[charId]; - if (dbChar.type !== "group") { - dbChar.emotionImages.push([name, imgp]); - db.characters[charId] = dbChar; + const selected = await selectSingleFile(['png']) + if(!selected){ + return } - setDatabase(db); - } - addingEmotion.set(false); + const img = selected.data + let db = get(DataBase) + const imgp = await saveImage(img) + db.userIcon = imgp + setDatabase(db) } -export async function rmCharEmotion(charId: number, emotionId: number) { - let db = get(DataBase); - let dbChar = db.characters[charId]; - if (dbChar.type !== "group") { - dbChar.emotionImages.splice(emotionId, 1); - db.characters[charId] = dbChar; - } - setDatabase(db); -} +export const addingEmotion = writable(false) -export async function exportChat(page: number) { - try { - const mode = await alertSelect(["Export as JSON", "Export as TXT"]); - const selectedID = get(selectedCharID); - const db = get(DataBase); - const chat = db.characters[selectedID].chats[page]; - const char = db.characters[selectedID]; - const date = new Date().toJSON(); - console.log(mode); - if (mode === "0") { - const stringl = Buffer.from( - JSON.stringify({ - type: "risuChat", - ver: 1, - data: chat, - }), - "utf-8" - ); - - await downloadFile( - `${char.name}_${date}_chat`.replace(/[<>:"/\\|?*\.\,]/g, "") + ".json", - stringl - ); - } else { - let stringl = chat.message - .map((v) => { - if (v.saying) { - return `${findCharacterbyId(v.saying).name}\n${v.data}`; - } else { - return `${v.role === "char" ? char.name : db.username}\n${v.data}`; - } - }) - .join("\n\n"); - - if (char.type !== "group") { - stringl = `${char.name}\n${char.firstMessage}\n\n` + stringl; - } - - await downloadFile( - `${char.name}_${date}_chat`.replace(/[<>:"/\\|?*\.\,]/g, "") + ".txt", - Buffer.from(stringl, "utf-8") - ); +export async function addCharEmotion(charId:number) { + addingEmotion.set(true) + const selected = await selectMultipleFile(['png', 'webp', 'gif']) + if(!selected){ + addingEmotion.set(false) + return } - alertNormal(language.successExport); - } catch (error) { - alertError(`${error}`); - } + let db = get(DataBase) + for(const f of selected){ + console.log(f) + const img = f.data + const imgp = await saveImage(img) + const name = f.name.replace('.png','').replace('.webp','') + let dbChar = db.characters[charId] + if(dbChar.type !== 'group'){ + dbChar.emotionImages.push([name,imgp]) + db.characters[charId] = dbChar + } + setDatabase(db) + } + addingEmotion.set(false) } -export async function importChat() { - const dat = await selectSingleFile(["json", "jsonl"]); - if (!dat) { - return; - } - try { - const selectedID = get(selectedCharID); - let db = get(DataBase); +export async function rmCharEmotion(charId:number, emotionId:number) { + let db = get(DataBase) + let dbChar = db.characters[charId] + if(dbChar.type !== 'group'){ + dbChar.emotionImages.splice(emotionId, 1) + db.characters[charId] = dbChar + } + setDatabase(db) +} - if (dat.name.endsWith("jsonl")) { - const lines = Buffer.from(dat.data).toString("utf-8").split("\n"); - let newChat: Chat = { - message: [], - note: "", - name: "Imported Chat", - localLore: [], - }; - let isFirst = true; - for (const line of lines) { - const presedLine = JSON.parse(line); - if ((presedLine.name && presedLine.is_user, presedLine.mes)) { - if (!isFirst) { - newChat.message.push({ - role: presedLine.is_user ? "user" : "char", - data: formatTavernChat( - presedLine.mes, - db.characters[selectedID].name - ), - }); - } +export async function exportChat(page:number){ + try { + + const mode = await alertSelect(['Export as JSON', "Export as TXT"]) + const selectedID = get(selectedCharID) + const db = get(DataBase) + const chat = db.characters[selectedID].chats[page] + const char = db.characters[selectedID] + const date = new Date().toJSON(); + console.log(mode) + if(mode === '0'){ + const stringl = Buffer.from(JSON.stringify({ + type: 'risuChat', + ver: 1, + data: chat + }), 'utf-8') + + await downloadFile(`${char.name}_${date}_chat`.replace(/[<>:"/\\|?*\.\,]/g, "") + '.json', stringl) + + } + else{ + + let stringl = chat.message.map((v) => { + if(v.saying){ + return `${findCharacterbyId(v.saying).name}\n${v.data}` + } + else{ + return `${v.role === 'char' ? char.name : db.username}\n${v.data}` + } + }).join('\n\n') + + if(char.type !== 'group'){ + stringl = `${char.name}\n${char.firstMessage}\n\n` + stringl + } + + await downloadFile(`${char.name}_${date}_chat`.replace(/[<>:"/\\|?*\.\,]/g, "") + '.txt', Buffer.from(stringl, 'utf-8')) + + } + alertNormal(language.successExport) + } catch (error) { + alertError(`${error}`) + } +} + +export async function importChat(){ + const dat =await selectSingleFile(['json','jsonl']) + if(!dat){ + return + } + try { + const selectedID = get(selectedCharID) + let db = get(DataBase) + + if(dat.name.endsWith('jsonl')){ + const lines = Buffer.from(dat.data).toString('utf-8').split('\n') + let newChat:Chat = { + message: [], + note: "", + name: "Imported Chat", + localLore: [] + } + + let isFirst = true + for(const line of lines){ + + const presedLine = JSON.parse(line) + if(presedLine.name && presedLine.is_user, presedLine.mes){ + if(!isFirst){ + newChat.message.push({ + role: presedLine.is_user ? "user" : 'char', + data: formatTavernChat(presedLine.mes, db.characters[selectedID].name) + }) + } + } + + isFirst = false + } + + if(newChat.message.length === 0){ + alertError(language.errors.noData) + return + } + + db.characters[selectedID].chats.push(newChat) + setDatabase(db) + alertNormal(language.successImport) + } + else{ + const json = JSON.parse(Buffer.from(dat.data).toString('utf-8')) + if(json.type === 'risuChat' && json.ver === 1){ + const das:Chat = json.data + if(!(checkNullish(das.message) || checkNullish(das.note) || checkNullish(das.name) || checkNullish(das.localLore))){ + db.characters[selectedID].chats.push(das) + setDatabase(db) + alertNormal(language.successImport) + return + } + else{ + alertError(language.errors.noData) + return + } + } + else{ + alertError(language.errors.noData) + return + } } - isFirst = false; - } + } catch (error) { + alertError(`${error}`) + } +} - if (newChat.message.length === 0) { - alertError(language.errors.noData); - return; - } +function formatTavernChat(chat:string, charName:string){ + const db = get(DataBase) + return chat.replace(/<([Uu]ser)>|\{\{([Uu]ser)\}\}/g, db.username).replace(/((\{\{)|<)([Cc]har)(=.+)?((\}\})|>)/g, charName) +} - db.characters[selectedID].chats.push(newChat); - setDatabase(db); - alertNormal(language.successImport); - } else { - const json = JSON.parse(Buffer.from(dat.data).toString("utf-8")); - if (json.type === "risuChat" && json.ver === 1) { - const das: Chat = json.data; - if ( - !( - checkNullish(das.message) || - checkNullish(das.note) || - checkNullish(das.name) || - checkNullish(das.localLore) - ) - ) { - db.characters[selectedID].chats.push(das); - setDatabase(db); - alertNormal(language.successImport); - return; - } else { - alertError(language.errors.noData); - return; +export function characterFormatUpdate(index:number|character){ + let db = get(DataBase) + let cha = typeof(index) === 'number' ? db.characters[index] : index + if(cha.chats.length === 0){ + cha.chats = [{ + message: [], + note: '', + name: 'Chat 1', + localLore: [] + }] + } + if(!cha.chats[cha.chatPage]){ + cha.chatPage = 0 + } + if(!cha.chats[cha.chatPage].message){ + cha.chats[cha.chatPage].message = [] + } + if(!cha.type){ + cha.type = 'character' + } + if(!cha.chaId){ + cha.chaId = uuidv4() + } + if(cha.type !== 'group'){ + if(checkNullish(cha.sdData)){ + cha.sdData = defaultSdDataFunc() } - } else { - alertError(language.errors.noData); - return; - } + if(checkNullish(cha.utilityBot)){ + cha.utilityBot = false + } + cha.alternateGreetings = cha.alternateGreetings ?? [] + cha.exampleMessage = cha.exampleMessage ?? '' + cha.creatorNotes = cha.creatorNotes ?? '' + cha.systemPrompt = cha.systemPrompt ?? '' + cha.postHistoryInstructions = cha.postHistoryInstructions ?? '' + cha.tags = cha.tags ?? [] + cha.creator = cha.creator ?? '' + cha.characterVersion = cha.characterVersion ?? 0 + cha.personality = cha.personality ?? '' + cha.scenario = cha.scenario ?? '' + cha.firstMsgIndex = cha.firstMsgIndex ?? -1 + } - } catch (error) { - alertError(`${error}`); - } + if(checkNullish(cha.customscript)){ + cha.customscript = [] + } + if(typeof(index) === 'number'){ + db.characters[index] = cha + setDatabase(db) + } + return cha } -function formatTavernChat(chat: string, charName: string) { - const db = get(DataBase); - return chat - .replace(/<([Uu]ser)>|\{\{([Uu]ser)\}\}/g, db.username) - .replace(/((\{\{)|<)([Cc]har)(=.+)?((\}\})|>)/g, charName); + +export function createBlankChar():character{ + return { + name: '', + firstMessage: '', + desc: '', + notes: '', + chats: [{ + message: [], + note: '', + name: 'Chat 1', + localLore: [] + }], + chatPage: 0, + emotionImages: [], + bias: [], + viewScreen: 'none', + globalLore: [], + chaId: uuidv4(), + type: 'character', + sdData: defaultSdDataFunc(), + utilityBot: false, + customscript: [], + exampleMessage: '', + creatorNotes:'', + systemPrompt:'', + postHistoryInstructions:'', + alternateGreetings:[], + tags:[], + creator:"", + characterVersion: 0, + personality:"", + scenario:"", + firstMsgIndex: -1 + } } -export function characterFormatUpdate(index: number | character) { - let db = get(DataBase); - let cha = typeof index === "number" ? db.characters[index] : index; - if (cha.chats.length === 0) { - cha.chats = [ - { - message: [], - note: "", - name: "Chat 1", - localLore: [], - }, - ]; - } - if (!cha.chats[cha.chatPage]) { - cha.chatPage = 0; - } - if (!cha.chats[cha.chatPage].message) { - cha.chats[cha.chatPage].message = []; - } - if (!cha.type) { - cha.type = "character"; - } - if (!cha.chaId) { - cha.chaId = uuidv4(); - } - if (cha.type !== "group") { - if (checkNullish(cha.sdData)) { - cha.sdData = defaultSdDataFunc(); - } - if (checkNullish(cha.utilityBot)) { - cha.utilityBot = false; - } - cha.alternateGreetings = cha.alternateGreetings ?? []; - cha.exampleMessage = cha.exampleMessage ?? ""; - cha.creatorNotes = cha.creatorNotes ?? ""; - cha.systemPrompt = cha.systemPrompt ?? ""; - cha.postHistoryInstructions = cha.postHistoryInstructions ?? ""; - cha.tags = cha.tags ?? []; - cha.creator = cha.creator ?? ""; - cha.characterVersion = cha.characterVersion ?? 0; - cha.personality = cha.personality ?? ""; - cha.scenario = cha.scenario ?? ""; - cha.firstMsgIndex = cha.firstMsgIndex ?? -1; - } - if (checkNullish(cha.customscript)) { - cha.customscript = []; - } - if (typeof index === "number") { - db.characters[index] = cha; - setDatabase(db); - } - return cha; -} - -export function createBlankChar(): character { - return { - name: "", - firstMessage: "", - desc: "", - notes: "", - chats: [ - { - message: [], - note: "", - name: "Chat 1", - localLore: [], - }, - ], - chatPage: 0, - emotionImages: [], - bias: [], - viewScreen: "none", - globalLore: [], - chaId: uuidv4(), - type: "character", - sdData: defaultSdDataFunc(), - utilityBot: false, - customscript: [], - exampleMessage: "", - creatorNotes: "", - systemPrompt: "", - postHistoryInstructions: "", - alternateGreetings: [], - tags: [], - creator: "", - characterVersion: 0, - personality: "", - scenario: "", - firstMsgIndex: -1, - }; -} export async function makeGroupImage() { - try { - alertStore.set({ - type: "wait", - msg: `Loading..`, - }); - const db = get(DataBase); - const charID = get(selectedCharID); - const group = db.characters[charID]; - if (group.type !== "group") { - return; - } - - const imageUrls = await Promise.all( - group.characters.map((v) => { - return getCharImage(findCharacterbyId(v).image, "plain"); - }) - ); - - const canvas = document.createElement("canvas"); - canvas.width = 256; - canvas.height = 256; - const ctx = canvas.getContext("2d"); - - // Load the images - const images = []; - let loadedImages = 0; - - await Promise.all( - imageUrls.map( - (url) => - new Promise((resolve) => { - const img = new Image(); - img.crossOrigin = "anonymous"; - img.onload = () => { - images.push(img); - resolve(); - }; - img.src = url; - }) - ) - ); - - // Calculate dimensions and draw the grid - const numImages = images.length; - const numCols = Math.ceil(Math.sqrt(images.length)); - const numRows = Math.ceil(images.length / numCols); - const cellWidth = canvas.width / numCols; - const cellHeight = canvas.height / numRows; - - for (let row = 0; row < numRows; row++) { - for (let col = 0; col < numCols; col++) { - const index = row * numCols + col; - if (index >= numImages) break; - ctx.drawImage( - images[index], - col * cellWidth, - row * cellHeight, - cellWidth, - cellHeight + try { + alertStore.set({ + type: 'wait', + msg: `Loading..` + }) + const db = get(DataBase) + const charID = get(selectedCharID) + const group = db.characters[charID] + if(group.type !== 'group'){ + return + } + + const imageUrls = await Promise.all(group.characters.map((v) => { + return getCharImage(findCharacterbyId(v).image, 'plain') + })) + + + + const canvas = document.createElement("canvas"); + canvas.width = 256 + canvas.height = 256 + const ctx = canvas.getContext("2d"); + + // Load the images + const images = []; + let loadedImages = 0; + + await Promise.all( + imageUrls.map( + (url) => + new Promise((resolve) => { + const img = new Image(); + img.crossOrigin="anonymous" + img.onload = () => { + images.push(img); + resolve(); + }; + img.src = url; + }) + ) ); - } + + // Calculate dimensions and draw the grid + const numImages = images.length; + const numCols = Math.ceil(Math.sqrt(images.length)); + const numRows = Math.ceil(images.length / numCols); + const cellWidth = canvas.width / numCols; + const cellHeight = canvas.height / numRows; + + for (let row = 0; row < numRows; row++) { + for (let col = 0; col < numCols; col++) { + const index = row * numCols + col; + if (index >= numImages) break; + ctx.drawImage( + images[index], + col * cellWidth, + row * cellHeight, + cellWidth, + cellHeight + ); + } + } + + // Return the image URI + + const uri = canvas.toDataURL() + console.log(uri) + canvas.remove() + db.characters[charID].image = await saveImage(dataURLtoBuffer(uri)); + setDatabase(db) + alertStore.set({ + type: 'none', + msg: '' + }) + } catch (error) { + alertError(`${error}`) } - - // Return the image URI - - const uri = canvas.toDataURL(); - console.log(uri); - canvas.remove(); - db.characters[charID].image = await saveImage(dataURLtoBuffer(uri)); - setDatabase(db); - alertStore.set({ - type: "none", - msg: "", - }); - } catch (error) { - alertError(`${error}`); - } } -function dataURLtoBuffer(string: string) { - const regex = /^data:.+\/(.+);base64,(.*)$/; +function dataURLtoBuffer(string:string){ + const regex = /^data:.+\/(.+);base64,(.*)$/; - const matches = string.match(regex); - const ext = matches[1]; - const data = matches[2]; - return Buffer.from(data, "base64"); + const matches = string.match(regex); + const ext = matches[1]; + const data = matches[2]; + return Buffer.from(data, 'base64'); } export async function addDefaultCharacters() { - const imgs = [fetch("/sample/rika.png"), fetch("/sample/yuzu.png")]; + const imgs = [fetch('/sample/rika.png'),fetch('/sample/yuzu.png')] - alertStore.set({ - type: "wait", - msg: `Loading Sample bots...`, - }); + alertStore.set({ + type: 'wait', + msg: `Loading Sample bots...` + }) - for (const img of imgs) { - const imgBuffer = await (await img).arrayBuffer(); - const readed = await exifr.parse(imgBuffer, true); - await sleep(10); - const va = decodeMsgpack(Buffer.from(readed.risuai, "base64")) as any; - if (va.type !== 101) { - alertError(language.errors.noData); - return; - } - let char: character = va.data; - let db = get(DataBase); - if (char.emotionImages && char.emotionImages.length > 0) { - for (let i = 0; i < char.emotionImages.length; i++) { - await sleep(10); - const imgp = await saveImage(char.emotionImages[i][1] as any); - char.emotionImages[i][1] = imgp; - } - } - char.chats = [ - { - message: [], - note: "", - name: "Chat 1", - localLore: [], - }, - ]; + for(const img of imgs){ + const imgBuffer = await (await img).arrayBuffer() + const readed = (await exifr.parse(imgBuffer, true)) + await sleep(10) + const va = decodeMsgpack(Buffer.from(readed.risuai, 'base64')) as any + if(va.type !== 101){ + alertError(language.errors.noData) + return + } + let char:character = va.data + let db = get(DataBase) + if(char.emotionImages && char.emotionImages.length > 0){ + for(let i=0;i Date: Sat, 13 May 2023 02:50:37 +0900 Subject: [PATCH 3/3] feat(NewCharButton): Update NewCharButton * Refactor NewCharButton * Remove BarIcon at NewCharButton * Replaced BaseRoundedButton and SVG --- src/lib/SideBars/Sidebar.svelte | 39 ++++++++++++++++++++--------- src/lib/UI/BaseRoundedButton.svelte | 16 ++++++++++++ 2 files changed, 43 insertions(+), 12 deletions(-) create mode 100644 src/lib/UI/BaseRoundedButton.svelte diff --git a/src/lib/SideBars/Sidebar.svelte b/src/lib/SideBars/Sidebar.svelte index 1569117d..061eeaa2 100644 --- a/src/lib/SideBars/Sidebar.svelte +++ b/src/lib/SideBars/Sidebar.svelte @@ -36,6 +36,7 @@ import { onDestroy } from "svelte"; import { isEqual } from "lodash"; import SidebarAvatar from "./SidebarAvatar.svelte"; + import BaseRoundedButton from "../UI/BaseRoundedButton.svelte"; let openPresetList = false; let sideBarMode = 0; let editMode = false; @@ -101,7 +102,9 @@ {#if menuMode === 0} {#each charImages as charimg, i}
- + {#if charimg !== ""}
{/each} - { - if (sideBarMode === 1) { - reseter(); - sideBarMode = 0; - } else { - reseter(); - sideBarMode = 1; - } - }}> +
+ { + if (sideBarMode === 1) { + reseter(); + sideBarMode = 0; + } else { + reseter(); + sideBarMode = 1; + } + }} + > +
{:else} { diff --git a/src/lib/UI/BaseRoundedButton.svelte b/src/lib/UI/BaseRoundedButton.svelte new file mode 100644 index 00000000..f0e4712b --- /dev/null +++ b/src/lib/UI/BaseRoundedButton.svelte @@ -0,0 +1,16 @@ + + +