From 3308bad0be6f6b41675899da8f4bb0961ba716cb Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Sun, 7 May 2023 14:29:23 +0900
Subject: [PATCH 1/4] [chore] updated github actions to use versions in json

---
 .github/workflows/github-actions-builder.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/github-actions-builder.yml b/.github/workflows/github-actions-builder.yml
index 102d85f5..83e57884 100644
--- a/.github/workflows/github-actions-builder.yml
+++ b/.github/workflows/github-actions-builder.yml
@@ -15,6 +15,10 @@ jobs:
 
     runs-on: ${{ matrix.platform }}
     steps:
+      - id: set_var
+        run: |
+          content=`cat /version.json`
+          echo "::set-output name=packageJson::$content"
       - uses: actions/checkout@v3
       - name: setup node
         uses: actions/setup-node@v3
@@ -42,8 +46,8 @@ jobs:
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           automatic_release_tag: "latest"
-          tag_name: "${{ github.event.head_commit.message }}"
-          name: "${{ github.event.head_commit.message }}"
+          tag_name: "${{fromJson(steps.set_var.outputs.packageJson).version}}"
+          name: "${{fromJson(steps.set_var.outputs.packageJson).version}}"
           generate_release_notes: true
           files: |
             src-tauri/target/x86_64-unknown-linux-gnu/release/**/*.deb
@@ -55,8 +59,8 @@ jobs:
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           automatic_release_tag: "latest"
-          tag_name: "${{ github.event.head_commit.message }}"
-          name: "${{ github.event.head_commit.message }}"
+          tag_name: "${{fromJson(steps.set_var.outputs.packageJson).version}}"
+          name: "${{fromJson(steps.set_var.outputs.packageJson).version}}"
           generate_release_notes: true
           files: |
             src-tauri/target/x86_64-apple-darwin/release/bundle/macos/*.app
@@ -68,8 +72,8 @@ jobs:
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           automatic_release_tag: "latest"
-          tag_name: "${{ github.event.head_commit.message }}"
-          name: "${{ github.event.head_commit.message }}"
+          tag_name: "${{fromJson(steps.set_var.outputs.packageJson).version}}"
+          name: "${{fromJson(steps.set_var.outputs.packageJson).version}}"
           generate_release_notes: true
           files: |
             src-tauri/target/x86_64-pc-windows-msvc/release/**/*.msi
\ No newline at end of file

From dbbd40977594d21788580e1aa3702085151a9f46 Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Sun, 7 May 2023 15:30:50 +0900
Subject: [PATCH 2/4] added backup fallback

---
 src/ts/drive/drive.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ts/drive/drive.ts b/src/ts/drive/drive.ts
index 24dd83f3..b22645aa 100644
--- a/src/ts/drive/drive.ts
+++ b/src/ts/drive/drive.ts
@@ -67,6 +67,7 @@ export async function checkDriverInit() {
             }
             else{
                 alertError(await res.text())
+                location.search = ''
             }
             return true
         }
@@ -74,6 +75,7 @@ export async function checkDriverInit() {
             return false
         }   
     } catch (error) {
+        location.search = ''
         console.error(error)
         alertError(`Backup Error: ${error}`)
         return false

From d9f7369bb22fb0ca2540396e802a381e5a43b70f Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Sun, 7 May 2023 15:44:47 +0900
Subject: [PATCH 3/4] [fix] emotion not reloading

---
 src/lib/SideBars/CharConfig.svelte | 40 +++++++++++++++++-------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte
index 43649c8d..761e340d 100644
--- a/src/lib/SideBars/CharConfig.svelte
+++ b/src/lib/SideBars/CharConfig.svelte
@@ -17,7 +17,7 @@
 
     let subMenu = 0
     let subberMenu = 0
-
+    let emos:[string, string][] = []
     let tokens = {
         desc: 0,
         firstMsg: 0,
@@ -119,13 +119,18 @@
                 }
             }
         }
+        emos = currentChar.data.emotionImages
     })
 
+    
     $: {
         if(database.characters[$selectedCharID].chaId === currentChar.data.chaId){
             database.characters[$selectedCharID] = currentChar.data
         }
-
+        else{
+            loadTokenize(currentChar.data)
+        }
+        emos = currentChar.data.emotionImages
         DataBase.set(database)
     }
 
@@ -252,22 +257,23 @@
                 <tr>
                     <div class="text-gray-500">{language.noImages}</div>
                 </tr>
+            {:else}
+                {#each emos as emo, i}
+                    <tr>
+                        {#await getCharImage(emo[1], 'plain')}
+                            <td class="font-medium truncate w-1/3"></td>
+                        {:then im}
+                            <td class="font-medium truncate w-1/3"><img src={im} alt="img" class="w-full"></td>                        
+                        {/await}
+                        <td class="font-medium truncate w-1/2">
+                            <input class="text-neutral-200 mt-2 mb-4 p-2 bg-transparent input-text text-xl focus:bg-selected" bind:value={currentChar.data.emotionImages[i][0]}>
+                        </td>
+                        <button class="font-medium cursor-pointer hover:text-green-500" on:click={() => {
+                            rmCharEmotion($selectedCharID,i)
+                        }}><TrashIcon /></button>
+                    </tr>
+                {/each}
             {/if}
-            {#each currentChar.data.emotionImages as emo, i}
-                <tr>
-                    {#await getCharImage(emo[1], 'plain')}
-                        <td class="font-medium truncate w-1/3"></td>
-                    {:then im}
-                        <td class="font-medium truncate w-1/3"><img src={im} alt="img" class="w-full"></td>                        
-                    {/await}
-                    <td class="font-medium truncate w-1/2">
-                        <input class="text-neutral-200 mt-2 mb-4 p-2 bg-transparent input-text text-xl focus:bg-selected" bind:value={currentChar.data.emotionImages[i][0]}>
-                    </td>
-                    <button class="font-medium cursor-pointer hover:text-green-500" on:click={() => {
-                        rmCharEmotion($selectedCharID,i)
-                    }}><TrashIcon /></button>
-                </tr>
-            {/each}
         </table>
 
         <div class="text-gray-500 hover:text-neutral-200 mt-2 flex">

From 65de60766bdada008a85ca124ec109cc01977b84 Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Sun, 7 May 2023 15:53:13 +0900
Subject: [PATCH 4/4] update version to 0.6.6

---
 src-tauri/tauri.conf.json          | 2 +-
 src/lib/SideBars/CharConfig.svelte | 4 ++--
 src/ts/database.ts                 | 2 +-
 version.json                       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 42e84dee..6f569a94 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "RisuAI",
-    "version": "0.6.5"
+    "version": "0.6.6"
   },
   "tauri": {
     "allowlist": {
diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte
index 761e340d..f2f1917d 100644
--- a/src/lib/SideBars/CharConfig.svelte
+++ b/src/lib/SideBars/CharConfig.svelte
@@ -203,13 +203,13 @@
 {:else if subMenu === 1}
     <h2 class="mb-2 text-2xl font-bold mt-2">{language.characterDisplay}</h2>
     <span class="text-neutral-200 mt-2 mb-2">{currentChar.type !== 'group' ? language.charIcon : language.groupIcon}</span>
-    <button on:click={() => {selectCharImg($selectedCharID)}}>
+    <button on:click={async () => {await selectCharImg($selectedCharID);currentChar = currentChar}}>
         {#if currentChar.data.image === ''}
             <div class="rounded-md h-32 w-32 shadow-lg bg-gray-500 cursor-pointer hover:text-green-500" />
         {:else}
             {#await getCharImage(currentChar.data.image, 'css')}
                 <div class="rounded-md h-32 w-32 shadow-lg bg-gray-500 cursor-pointer hover:text-green-500"></div>
-            {:then im} 
+            {:then im}
                 <div class="rounded-md h-32 w-32 shadow-lg bg-gray-500 cursor-pointer hover:text-green-500" style={im} />                
             {/await}
         {/if}
diff --git a/src/ts/database.ts b/src/ts/database.ts
index 0c9076c2..e28360c9 100644
--- a/src/ts/database.ts
+++ b/src/ts/database.ts
@@ -6,7 +6,7 @@ import { saveImage as saveImageGlobal } from './globalApi';
 
 export const DataBase = writable({} as any as Database)
 export const loadedStore = writable(false)
-export let appVer = '0.6.5'
+export let appVer = '0.6.6'
 
 
 export function setDatabase(data:Database){
diff --git a/version.json b/version.json
index 533d13ba..2ab2aec2 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version":"0.6.5"}
+{"version":"0.6.6"}