diff --git a/.github/workflows/github-actions-builder.yml b/.github/workflows/github-actions-builder.yml index d026a3c6..9d474dfa 100644 --- a/.github/workflows/github-actions-builder.yml +++ b/.github/workflows/github-actions-builder.yml @@ -70,7 +70,7 @@ jobs: run: rustup target add x86_64-apple-darwin - if: matrix.settings.platform == 'macos-latest' run: rustup target add aarch64-apple-darwin - - uses: tauri-apps/tauri-action@v0 + - uses: tauri-apps/tauri-action@v0.5.16 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 228d9ddf..3c36d6c7 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -29,7 +29,7 @@ }, "productName": "RisuAI", "mainBinaryName": "RisuAI", - "version": "143.0.1", + "version": "143.5.0", "identifier": "co.aiclient.risu", "plugins": { "updater": { diff --git a/src/lang/en.ts b/src/lang/en.ts index b0c9be33..ae61f590 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -460,7 +460,7 @@ export const languageEnglish = { loadDataFromAccount: "Load Data from Account", saveCurrentDataToAccount: "Save Current Data to Account", chatAssumed: "", - proxyAPIKey: "Proxy Key/Password", + proxyAPIKey: "Key/Password", proxyRequestModel: "Request Model", officialWiki: "Official Wiki", officialWikiDesc: "Official Wiki for RisuAI. feel free to see.", @@ -807,8 +807,8 @@ export const languageEnglish = { predictedOutput: "Predicted Output", systemContentReplacement: "System Content Replacement", systemRoleReplacement: "System Role Replacement", - seperateParameters: "Seperate Parameters", - seperateParametersEnabled: "Enable Seperate Parameters", + seperateParameters: "Separate Parameters", + seperateParametersEnabled: "Enable Separate Parameters", summarizationPrompt: "Summarization Prompt", translatorPrompt: "Translation Prompt", translateBeforeHTMLFormatting: "Translate Before HTML Formatting", @@ -822,4 +822,5 @@ export const languageEnglish = { googleCloudTokenization: "Google Cloud Tokenization", presetChain: "Preset Chain", legacyMediaFindings: "Legacy Media Findings", + staticsDisclaimer: "The statistics are based on the data from after July 2024. the data may not be accurate.", } \ No newline at end of file diff --git a/src/lib/ChatScreens/DefaultChatScreen.svelte b/src/lib/ChatScreens/DefaultChatScreen.svelte index 7bdf0b87..abe258a5 100644 --- a/src/lib/ChatScreens/DefaultChatScreen.svelte +++ b/src/lib/ChatScreens/DefaultChatScreen.svelte @@ -2,7 +2,7 @@ import Suggestion from './Suggestion.svelte'; import AdvancedChatEditor from './AdvancedChatEditor.svelte'; - import { CameraIcon, DatabaseIcon, DicesIcon, GlobeIcon, ImagePlusIcon, LanguagesIcon, Laugh, MenuIcon, MicOffIcon, PackageIcon, Plus, RefreshCcwIcon, ReplyIcon, Send, StepForwardIcon } from "lucide-svelte"; + import { CameraIcon, DatabaseIcon, DicesIcon, GlobeIcon, ImagePlusIcon, LanguagesIcon, Laugh, MenuIcon, MicOffIcon, PackageIcon, Plus, RefreshCcwIcon, ReplyIcon, Send, StepForwardIcon, XIcon } from "lucide-svelte"; import { selectedCharID, PlaygroundStore, createSimpleCharacter } from "../../ts/stores.svelte"; import Chat from "./Chat.svelte"; import { type Message, type character, type groupChat } from "../../ts/storage/database.svelte"; @@ -25,7 +25,7 @@ import { PreUnreroll, Prereroll } from 'src/ts/process/prereroll'; import { processMultiCommand } from 'src/ts/process/command'; import { postChatFile } from 'src/ts/process/files/multisend'; - import { getInlayImage } from 'src/ts/process/files/image'; + import { getInlayAsset } from 'src/ts/process/files/inlays'; import PlaygroundMenu from '../Playground/PlaygroundMenu.svelte'; import { ConnectionOpenStore } from 'src/ts/sync/multiuser'; @@ -71,7 +71,7 @@ if(fileInput.length > 0){ for(const file of fileInput){ - messageInput += `{{inlay::${file}}}` + messageInput += `{{inlayed::${file}}}` } fileInput = [] } @@ -546,8 +546,31 @@ {#if fileInput.length > 0}
{#each fileInput as file, i} - {#await getInlayImage(file) then inlayImage} - Inlay + {#await getInlayAsset(file) then inlayAsset} +
+ {#if inlayAsset.type === 'image'} + Inlay + {:else if inlayAsset.type === 'video'} + + {:else if inlayAsset.type === 'audio'} + + {:else} +
{file}
+ {/if} + +
{/await} {/each}
@@ -741,7 +764,7 @@
{ const res = await postChatFile(messageInput) - if(res?.type === 'image'){ + if(res?.type === 'asset'){ fileInput.push(res.data) updateInputSizeAll() } diff --git a/src/lib/Setting/Pages/AdvancedSettings.svelte b/src/lib/Setting/Pages/AdvancedSettings.svelte index 53c2a842..b93d59ae 100644 --- a/src/lib/Setting/Pages/AdvancedSettings.svelte +++ b/src/lib/Setting/Pages/AdvancedSettings.svelte @@ -1,7 +1,7 @@