Merge branch 'dev' into dev

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "RisuAI",
-    "version": "1.22.2"
+    "version": "1.22.3"
   },
   "tauri": {
     "allowlist": {

src/lib/ChatScreens/Chat.svelte

@@ -84,9 +84,11 @@
                         <button class={"hover:text-green-500 transition-colors "+(editMode?'text-green-400':'')} on:click={() => {
                             if(!editMode){
                                 editMode = true
+                                msgTranslated = ""
                             }
                             else{
                                 editMode = false
+                                msgTranslated = ""
                                 edit()
                             }
                         }}>
@@ -144,8 +146,9 @@
                 {#await ParseMarkdown(msgDisplay, character) then md} 
                     <!-- svelte-ignore a11y-click-events-have-key-events -->
                     <span class="text chat chattext prose prose-invert minw-0" on:click={() => {
-                        if($DataBase.clickToEdit){
+                        if($DataBase.clickToEdit && idx > -1){
                             editMode = true
+                            msgTranslated = ""
                         }
                     }}
                         style:font-size="{0.875 * ($DataBase.zoomsize / 100)}rem"

src/lib/ChatScreens/Suggestion.svelte

@@ -37,7 +37,8 @@
         }
     }
     
-    const unsubscribe = doingChat.subscribe((v) => {
+
+    const unsub = doingChat.subscribe((v) => {
         if(v) {
             progress=false
             abortController?.abort()
@@ -89,8 +90,10 @@
             }
         }
     }
+
+    onDestroy(unsub)
+
     $: {translateSuggest(toggleTranslate, suggestMessages)}
-    onDestroy(unsubscribe)
 </script>
 
 <div class="ml-4 flex flex-wrap">

src/lib/Setting/Pages/BotSettings.svelte

@@ -147,8 +147,6 @@
     <span class="text-neutral-200">{language.globalNote} <Help key="globalNote"/></span>
     <textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 resize-none h-20 min-h-20 focus:bg-selected text-xs w-full" autocomplete="off" bind:value={$DataBase.globalNote}></textarea>
     <span class="text-gray-400 mb-6 text-sm">{tokens.globalNote} {language.tokens}</span>
-    <span class="text-neutral-200">{language.autoSuggest} <Help key="autoSuggest"/></span>
-    <textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 resize-none h-20 min-h-20 focus:bg-selected text-xs w-full" autocomplete="off" bind:value={$DataBase.autoSuggestPrompt}></textarea>
     <span class="text-gray-400 mb-6 text-sm">{tokens.autoSuggest} {language.tokens}</span>
 
     <span class="text-neutral-200">{language.maxContextSize}</span>
@@ -177,6 +175,9 @@
 <input class="text-neutral-200 p-2 bg-transparent input-text focus:bg-selected text-sm"bind:value={$DataBase.forceReplaceUrl} placeholder="Leave blank to not replace url">
 <span class="text-neutral-200 mt-2">{language.submodel} {language.forceReplaceUrl} <Help key="forceUrl"/></span>
 <input class="text-neutral-200 p-2 bg-transparent input-text focus:bg-selected text-sm"bind:value={$DataBase.forceReplaceUrl2} placeholder="Leave blank to not replace url">
+<span class="text-neutral-200">{language.autoSuggest} <Help key="autoSuggest"/></span>
+<textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 resize-none h-20 min-h-20 focus:bg-selected text-xs w-full" autocomplete="off" bind:value={$DataBase.autoSuggestPrompt}></textarea>
+
 {/if}
 
 

src/ts/storage/database.ts

@@ -8,7 +8,7 @@ import { defaultAutoSuggestPrompt, defaultJailbreak, defaultMainPrompt } from '.
 
 export const DataBase = writable({} as any as Database)
 export const loadedStore = writable(false)
-export let appVer = '1.22.2'
+export let appVer = '1.22.3'
 
 export function setDatabase(data:Database){
     if(checkNullish(data.characters)){

version.json

@@ -1 +1 @@
-{"version":"1.22.2"}
+{"version":"1.22.3"}