From 3e34c17f3b4b41a33efab2054a3637c36dec70ba Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Fri, 12 May 2023 22:20:57 +0900
Subject: [PATCH] [fix] lore activation without first key

---
 src/lang/en.ts                          |  4 ++--
 src/lib/ChatScreens/CreatorQuote.svelte |  3 ++-
 src/lib/SideBars/LoreBookData.svelte    |  2 +-
 src/ts/process/lorebook.ts              | 17 +++++++++--------
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/lang/en.ts b/src/lang/en.ts
index 6ed2f431..03377ff5 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -65,7 +65,7 @@ export const languageEnglish = {
                 + "\n\nExample format of conversations:"
                 + "\n\n```\n<START>\n{{user}}: hi\n{{char}}: hello\n<START>\n{{user}}: hi\nHaruhi: hello\n```"
                 + "\n\n```<START>``` Marks the beginning of a new conversation.",
-        creatorQuotes: "Quote that appearances on top of first message. Used to inform users about this character. It doesn't go into prompt.",
+        creatorQuotes: "Note that appearances on top of first message. Used to inform users about this character. It doesn't go into prompt.",
         systemPrompt: "A prompt that replaces main prompt in settings if its not blank.",
         chatNote: "a note that strongly effects model behavior. embbedded to current chat. also known as memory.",
         personality: "A brief description about character's personality. \n\n**It is not recommended to use this option. Describe it in character description instead.**",
@@ -225,7 +225,7 @@ export const languageEnglish = {
     loadLatest: "Load Latest Backup",
     loadOthers: "Load Other Backups",
     exampleMessage: "Example Message",
-    creatorNotes: "Creator's Quote",
+    creatorNotes: "Creator's Comment",
     systemPrompt: "System Prompt",
     characterNotes: "Character Notes",
     personality: "Personality",
diff --git a/src/lib/ChatScreens/CreatorQuote.svelte b/src/lib/ChatScreens/CreatorQuote.svelte
index ace3b5c8..af357ba6 100644
--- a/src/lib/ChatScreens/CreatorQuote.svelte
+++ b/src/lib/ChatScreens/CreatorQuote.svelte
@@ -1,6 +1,6 @@
 <div class="flex w-full justify-center">
     <div class="w-3xl max-w-80p bg-darkbg rounded-md p-3 text-white text-sm">
-        <h1 class="text-xl font-bold mb-2">Creator's Quote
+        <h1 class="text-xl font-bold mb-2">{language.creatorNotes}
             <button class="float-right" on:click={onRemove}>
                 <XIcon />
             </button>
@@ -12,6 +12,7 @@
 </div>
 <script lang="ts">
     import { XIcon } from "lucide-svelte";
+  import { language } from "src/lang";
   import { ParseMarkdown } from "src/ts/parser";
 
     export let onRemove: () => void
diff --git a/src/lib/SideBars/LoreBookData.svelte b/src/lib/SideBars/LoreBookData.svelte
index 33f9846b..0383c219 100644
--- a/src/lib/SideBars/LoreBookData.svelte
+++ b/src/lib/SideBars/LoreBookData.svelte
@@ -16,7 +16,7 @@
             value.secondkey = value.secondkey ?? ''
             open = !open
         }}>
-            <span>{value.comment.length === 0 ? 'Unnamed Lore' : value.comment}</span>
+            <span>{value.comment.length === 0 ? value.key.length === 0 ? "Unnamed Lore" : value.key : value.comment}</span>
         </button>
         <button class="valuer" on:click={async () => {
             const d = await alertConfirm(language.removeConfirm + value.comment)
diff --git a/src/ts/process/lorebook.ts b/src/ts/process/lorebook.ts
index ec183109..1cbc562d 100644
--- a/src/ts/process/lorebook.ts
+++ b/src/ts/process/lorebook.ts
@@ -102,15 +102,16 @@ export async function loadLoreBookPrompt(){
             }
         }
 
-        if(firstKeyActivation && lore.secondKey.length === 0){
-            activatiedPrompt.push(lore.content)
-            continue
-        }
-
-        for(const key of lore.secondKey){
-            if(formatedChat.includes(key)){
+        if(firstKeyActivation){
+            if(lore.secondKey.length === 0){
                 activatiedPrompt.push(lore.content)
-                break
+                continue
+            }
+            for(const key of lore.secondKey){
+                if(formatedChat.includes(key)){
+                    activatiedPrompt.push(lore.content)
+                    break
+                }
             }
         }
     }