conflict fix

src/lang/cn.ts

@@ -300,5 +300,7 @@ export const languageChinese = {
     activationProbability: "概率",
     shareCloud: "分享到RisuRealm",
     hub: "RisuRealm",
-    tags: "标签"
+    tags: "标签",
+    copied: "已复制",
+    useChatCopy: "使用聊天复制",
 }

src/lang/en.ts

@@ -304,5 +304,7 @@ export const languageEnglish = {
     shareCloud: "Share to RisuRealm",
     hub: "RisuRealm",
     tags: "Tags",
-    backgroundHTML: "Background Embedding"
+    backgroundHTML: "Background Embedding",
+    copied: "Copied",
+    useChatCopy: "Use Chat Message Copy",
 }

src/lang/ko.ts

@@ -276,5 +276,7 @@ export const languageKorean = {
     active: "활성화",
     loreRandomActivation: "확률 조건 사용",
     activationProbability: "발동 확률",
-    backgroundHTML: "백그라운드 임베딩"
+    backgroundHTML: "백그라운드 임베딩",
+    copied: "복사됨",
+    useChatCopy: "채팅 메시지 복사 사용",
 }

src/lib/ChatScreens/Chat.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { ArrowLeft, ArrowRight, EditIcon, LanguagesIcon, RefreshCcwIcon, TrashIcon } from "lucide-svelte";
+    import { ArrowLeft, ArrowRight, EditIcon, LanguagesIcon, RefreshCcwIcon, TrashIcon, CopyIcon } from "lucide-svelte";
     import { ParseMarkdown } from "../../ts/parser";
     import AutoresizeArea from "./AutoresizeArea.svelte";
     import { alertConfirm } from "../../ts/alert";
@@ -19,6 +19,7 @@
     export let character:character|groupChat|null = null
     let translating = false
     let editMode = false
+    let statusMessage:string = ''
     export let altGreeting = false
 
     let msgDisplay = ''
@@ -65,6 +66,14 @@
         }
     }
 
+    const setStatusMessage = (message:string, timeout:number = 0)=>{
+        statusMessage = message
+        if(timeout === 0) return
+        setTimeout(() => {
+            statusMessage = ''
+        }, timeout)
+    }
+
     $: displaya(message)
 </script>
 <div class="flex max-w-full justify-center" class:bgc={isLastMemory}>
@@ -80,8 +89,18 @@
             <div class="flexium items-center chat">
                 <span class="chat text-xl unmargin">{name}</span>
                 <div class="flex-grow flex items-center justify-end text-gray-500">
+                    <span class="text-xs">{statusMessage}</span>
+                    {#if $DataBase.useChatCopy}
+                        <button class="ml-2 hover:text-green-500 transition-colors" on:click={()=>{
+                            window.navigator.clipboard.writeText(msgDisplay).then(() => {
+                                setStatusMessage(language.copied)
+                            })
+                        }}>
+                            <CopyIcon size={20}/>
+                        </button>    
+                    {/if}
                     {#if idx > -1}
-                        <button class={"hover:text-green-500 transition-colors "+(editMode?'text-green-400':'')} on:click={() => {
+                        <button class={"ml-2 hover:text-green-500 transition-colors "+(editMode?'text-green-400':'')} on:click={() => {
                             if(!editMode){
                                 editMode = true
                                 msgTranslated = ""

src/lib/Setting/Pages/DisplaySettings.svelte

@@ -145,5 +145,9 @@
         }}/>
         <span>{language.textScreenBorder}</span>
     </div>
+{/if}
 
-{/if}
+<div class="flex items-center mt-2">
+    <Check bind:check={$DataBase.useChatCopy}/>
+    <span>{language.useChatCopy}</span>
+</div>

src/ts/storage/database.ts

@@ -503,6 +503,7 @@ export interface Database{
     autoSuggestPrompt:string,
     claudeAPIKey:string,
     novellistAPI:string
+    useChatCopy:boolean,
 }
 
 interface hordeConfig{