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 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 43649c8d..f2f1917d 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) } @@ -198,13 +203,13 @@ {:else if subMenu === 1}

{language.characterDisplay}

{currentChar.type !== 'group' ? language.charIcon : language.groupIcon} - + + {/each} {/if} - {#each currentChar.data.emotionImages as emo, i} - - {#await getCharImage(emo[1], 'plain')} - - {:then im} - img - {/await} - - - - - - {/each}
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/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 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"}