From 9ef3dea884735f6e90a4171b17f937599531a5c5 Mon Sep 17 00:00:00 2001
From: Succubyss <87207237+Succubyss@users.noreply.github.com>
Date: Tue, 14 May 2024 17:36:10 -0500
Subject: [PATCH 01/11] rule typo fix for /while example

---
 public/scripts/variables.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/scripts/variables.js b/public/scripts/variables.js
index bfaaab2af..f4d753ba6 100644
--- a/public/scripts/variables.js
+++ b/public/scripts/variables.js
@@ -1158,7 +1158,7 @@ export function registerVariableCommands() {
                 <strong>Examples:</strong>
                 <ul>
                     <li>
-                        <pre><code class="language-stscript">/setvar key=i 0 | /while left=i right=10 rule=let "/addvar key=i 1"</code></pre>
+                        <pre><code class="language-stscript">/setvar key=i 0 | /while left=i right=10 rule=lte "/addvar key=i 1"</code></pre>
                         adds 1 to the value of "i" until it reaches 10.
                     </li>
                 </ul>

From 1999f607d6af32b4d46a2d888f36cc623844ce17 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 15 May 2024 13:19:23 +0300
Subject: [PATCH 02/11] Set tainted flag metadata if a message was edited

---
 public/script.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/script.js b/public/script.js
index 8dd9b427e..a378b52ba 100644
--- a/public/script.js
+++ b/public/script.js
@@ -6275,6 +6275,8 @@ function updateMessage(div) {
         mes.extra.bias = null;
     }
 
+    chat_metadata['tainted'] = true;
+
     return { mesBlock, text, mes, bias };
 }
 

From 87b61f7cfff19d79038ad1e292668018b7cec399 Mon Sep 17 00:00:00 2001
From: LenAnderson <Anderson.Len@outlook.com>
Date: Wed, 15 May 2024 08:27:22 -0400
Subject: [PATCH 03/11] fix QR editor on narrow screen

---
 public/scripts/extensions/quick-reply/style.css  | 6 +++++-
 public/scripts/extensions/quick-reply/style.less | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/public/scripts/extensions/quick-reply/style.css b/public/scripts/extensions/quick-reply/style.css
index 1afd83ce4..d9811993d 100644
--- a/public/scripts/extensions/quick-reply/style.css
+++ b/public/scripts/extensions/quick-reply/style.css
@@ -218,11 +218,15 @@
 @media screen and (max-width: 750px) {
   body .dialogue_popup:has(#qr--modalEditor) .dialogue_popup_text > #qr--modalEditor {
     flex-direction: column;
+    overflow: auto;
+  }
+  body .dialogue_popup:has(#qr--modalEditor) .dialogue_popup_text > #qr--modalEditor > #qr--main {
+    flex: 0 0 auto;
   }
   body .dialogue_popup:has(#qr--modalEditor) .dialogue_popup_text > #qr--modalEditor > #qr--main > .qr--labels {
     flex-direction: column;
   }
-  body .dialogue_popup:has(#qr--modalEditor) .dialogue_popup_text > #qr--modalEditor > #qr--main > .qr--modal-messageContainer > #qr--modal-message {
+  body .dialogue_popup:has(#qr--modalEditor) .dialogue_popup_text > #qr--modalEditor > #qr--main > .qr--modal-messageContainer > #qr--modal-messageHolder {
     min-height: 90svh;
   }
 }
diff --git a/public/scripts/extensions/quick-reply/style.less b/public/scripts/extensions/quick-reply/style.less
index ca4f385ba..bec986978 100644
--- a/public/scripts/extensions/quick-reply/style.less
+++ b/public/scripts/extensions/quick-reply/style.less
@@ -244,10 +244,14 @@
 @media screen and (max-width: 750px) {
 	body .dialogue_popup:has(#qr--modalEditor) .dialogue_popup_text > #qr--modalEditor {
 		flex-direction: column;
+		overflow: auto;
+		> #qr--main {
+			flex: 0 0 auto;
+		}
 		> #qr--main > .qr--labels {
 			flex-direction: column;
 		}
-		> #qr--main > .qr--modal-messageContainer > #qr--modal-message {
+		> #qr--main > .qr--modal-messageContainer > #qr--modal-messageHolder {
 			min-height: 90svh;
 		}
 	}

From f1a57d76a2688f7d6072553318c5affee2036a72 Mon Sep 17 00:00:00 2001
From: steve green <steve_green@qq.com>
Date: Wed, 15 May 2024 21:27:50 +0800
Subject: [PATCH 04/11] enable `import_card_tags` by default

---
 public/scripts/power-user.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 93186df20..540cea914 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -282,6 +282,7 @@ let power_user = {
     forbid_external_media: true,
     external_media_allowed_overrides: [],
     external_media_forbidden_overrides: [],
+    import_card_tags: true,
 };
 
 let themes = [];

From 796cc3c60cd03d627f5af1e9f481e1856db3112a Mon Sep 17 00:00:00 2001
From: steve02081504 <steve02081504@EDEN.fukwold>
Date: Wed, 15 May 2024 21:34:09 +0800
Subject: [PATCH 05/11] add `import_tags` in list of more opt

---
 public/index.html | 3 +++
 public/script.js  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/public/index.html b/public/index.html
index 06d781af6..b0b0e4ba3 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4493,6 +4493,9 @@
                                                 <option id="replace_update" data-i18n="Replace / Update">
                                                     Replace / Update
                                                 </option>
+                                                <option id="import_tags" data-i18n="Import Tags">
+                                                    Import Tags
+                                                </option>
                                                 <!--<option id="dupe_button">
                                                         Duplicate
                                                     </option>
diff --git a/public/script.js b/public/script.js
index a378b52ba..8775ccfe2 100644
--- a/public/script.js
+++ b/public/script.js
@@ -10294,6 +10294,9 @@ jQuery(async function () {
                     $('#character_replace_file').off('change').on('change', uploadReplacementCard).trigger('click');
                 }
             } break;
+            case 'import_tags':{
+                await importTags(characters[this_chid]);
+            } break;
             /*case 'delete_button':
                 popup_type = "del_ch";
                 callPopup(`

From b6f47c9927173e4179b5d73dff81408e7433ab5c Mon Sep 17 00:00:00 2001
From: LenAnderson <Anderson.Len@outlook.com>
Date: Wed, 15 May 2024 09:51:23 -0400
Subject: [PATCH 06/11] prevent overflow of command results

---
 public/scripts/extensions/quick-reply/style.css  | 4 ++++
 public/scripts/extensions/quick-reply/style.less | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/public/scripts/extensions/quick-reply/style.css b/public/scripts/extensions/quick-reply/style.css
index d9811993d..ac114cf10 100644
--- a/public/scripts/extensions/quick-reply/style.css
+++ b/public/scripts/extensions/quick-reply/style.css
@@ -209,6 +209,10 @@
   justify-content: center;
   padding-bottom: 0.5em;
 }
+#qr--qrOptions {
+  display: flex;
+  flex-direction: column;
+}
 #qr--qrOptions > #qr--ctxEditor .qr--ctxItem {
   display: flex;
   flex-direction: row;
diff --git a/public/scripts/extensions/quick-reply/style.less b/public/scripts/extensions/quick-reply/style.less
index bec986978..1e3b48629 100644
--- a/public/scripts/extensions/quick-reply/style.less
+++ b/public/scripts/extensions/quick-reply/style.less
@@ -229,6 +229,8 @@
 
 
 #qr--qrOptions {
+	display: flex;
+	flex-direction: column;
 	> #qr--ctxEditor {
 		.qr--ctxItem {
 			display: flex;

From 686113592575b0c4e79a54b03a50c8d2504e37ba Mon Sep 17 00:00:00 2001
From: steve green <steve_green@qq.com>
Date: Wed, 15 May 2024 22:02:28 +0800
Subject: [PATCH 07/11] Discard changes to public/scripts/power-user.js

---
 public/scripts/power-user.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 540cea914..93186df20 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -282,7 +282,6 @@ let power_user = {
     forbid_external_media: true,
     external_media_allowed_overrides: [],
     external_media_forbidden_overrides: [],
-    import_card_tags: true,
 };
 
 let themes = [];

From d5869e3f90c6a990fda638e5a5ae94153e7f7b6c Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 15 May 2024 17:21:51 +0300
Subject: [PATCH 08/11] Fix isolated modules not being loaded

---
 public/index.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/index.html b/public/index.html
index b0b0e4ba3..26dcd2ec2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6341,6 +6341,9 @@
     <script type="module" src="lib/swiped-events.js"></script>
     <script type="module" src="lib/eventemitter.js"></script>
     <script type="module" src="scripts/i18n.js"></script>
+    <script type="module" src="scripts/bulk-edit.js"></script>
+    <script type="module" src="scripts/setting-search.js"></script>
+    <script type="module" src="scripts/server-history.js"></script>
     <script type="module" src="script.js"></script>
     <script>
         // Configure toast library:

From 36f7bc4aae2a316f68366da934fdc016de574a04 Mon Sep 17 00:00:00 2001
From: LenAnderson <Anderson.Len@outlook.com>
Date: Wed, 15 May 2024 15:41:26 -0400
Subject: [PATCH 09/11] reduce qr editor small screen height

---
 public/scripts/extensions/quick-reply/style.css  | 2 +-
 public/scripts/extensions/quick-reply/style.less | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/scripts/extensions/quick-reply/style.css b/public/scripts/extensions/quick-reply/style.css
index ac114cf10..8b479affa 100644
--- a/public/scripts/extensions/quick-reply/style.css
+++ b/public/scripts/extensions/quick-reply/style.css
@@ -231,7 +231,7 @@
     flex-direction: column;
   }
   body .dialogue_popup:has(#qr--modalEditor) .dialogue_popup_text > #qr--modalEditor > #qr--main > .qr--modal-messageContainer > #qr--modal-messageHolder {
-    min-height: 90svh;
+    min-height: 50svh;
   }
 }
 .dialogue_popup:has(#qr--modalEditor) {
diff --git a/public/scripts/extensions/quick-reply/style.less b/public/scripts/extensions/quick-reply/style.less
index 1e3b48629..50a89003f 100644
--- a/public/scripts/extensions/quick-reply/style.less
+++ b/public/scripts/extensions/quick-reply/style.less
@@ -254,7 +254,7 @@
 			flex-direction: column;
 		}
 		> #qr--main > .qr--modal-messageContainer > #qr--modal-messageHolder {
-			min-height: 90svh;
+			min-height: 50svh;
 		}
 	}
 }

From c4936ed535e0699ef925e2f91c703d2952e92a2a Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 15 May 2024 23:06:10 +0300
Subject: [PATCH 10/11] Properly colorize webkit search cancel button

---
 public/style.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/style.css b/public/style.css
index 897df7af2..000761754 100644
--- a/public/style.css
+++ b/public/style.css
@@ -2374,16 +2374,16 @@ input[type=search]::-webkit-search-cancel-button {
     height: 1em;
     width: 1em;
     border-radius: 50em;
-    background: url('/img/times-circle.svg') no-repeat 50% 50%;
+    background-color: var(--SmartThemeBodyColor);
+    mask: url('/img/times-circle.svg') no-repeat 50% 50%;
     background-size: contain;
-    backdrop-filter: invert(1) contrast(9);
     opacity: 0;
     pointer-events: none;
     cursor: pointer;
 }
 
 input[type=search]:focus::-webkit-search-cancel-button {
-    opacity: .3;
+    opacity: .5;
     pointer-events: all;
 }
 

From 7289ed72f80d7cc9ac8eaadf5d829aee8f321def Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 15 May 2024 23:31:09 +0300
Subject: [PATCH 11/11] #2240 Yes, I can add new maker suite model

---
 public/index.html                          | 7 +++++--
 public/scripts/extensions/caption/index.js | 6 ++++++
 public/scripts/openai.js                   | 4 +++-
 src/endpoints/backends/chat-completions.js | 2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/public/index.html b/public/index.html
index 26dcd2ec2..03afe1a23 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1719,8 +1719,9 @@
                                     <div class="range-block" data-source="makersuite">
                                         <label for="use_makersuite_sysprompt" class="checkbox_label widthFreeExpand">
                                             <input id="use_makersuite_sysprompt" type="checkbox" />
-                                            <span data-i18n="Use system prompt (Gemini 1.5 pro+ only)">
-                                                Use system prompt (Gemini 1.5 pro+ only)
+                                            <span>
+                                                <span data-i18n="Use system prompt">Use system prompt</span><br>
+                                                <small data-i18n="(Gemini 1.5 Pro/Flash only)">(Gemini 1.5 Pro/Flash only)</small>
                                             </span>
                                         </label>
                                         <div class="toggle-description justifyLeft marginBot5">
@@ -2648,6 +2649,8 @@
                                 <h4 data-i18n="Google Model">Google Model</h4>
                                 <select id="model_google_select">
                                     <optgroup label="Latest">
+                                        <!-- Doesn't work without "latest". Maybe my key is scuffed? -->
+                                        <option value="gemini-1.5-flash-latest">Gemini 1.5 Flash</option>
                                         <!-- Points to 1.0, no default 1.5 endpoint -->
                                         <option value="gemini-pro">Gemini Pro</option>
                                         <option value="gemini-pro-vision">Gemini Pro Vision</option>
diff --git a/public/scripts/extensions/caption/index.js b/public/scripts/extensions/caption/index.js
index f0738e5d5..79a68e22b 100644
--- a/public/scripts/extensions/caption/index.js
+++ b/public/scripts/extensions/caption/index.js
@@ -440,8 +440,12 @@ jQuery(function () {
                                 <option data-type="anthropic" value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option>
                                 <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
                                 <option data-type="google" value="gemini-pro-vision">gemini-pro-vision</option>
+                                <option data-type="google" value="gemini-1.5-flash-latest">gemini-1.5-flash-latest</option>
                                 <option data-type="openrouter" value="openai/gpt-4-vision-preview">openai/gpt-4-vision-preview</option>
+                                <option data-type="openrouter" value="openai/gpt-4o">openai/gpt-4o</option>
+                                <option data-type="openrouter" value="openai/gpt-4-turbo">openai/gpt-4-turbo</option>
                                 <option data-type="openrouter" value="haotian-liu/llava-13b">haotian-liu/llava-13b</option>
+                                <option data-type="openrouter" value="fireworks/firellava-13b">fireworks/firellava-13b</option>
                                 <option data-type="openrouter" value="anthropic/claude-3-haiku">anthropic/claude-3-haiku</option>
                                 <option data-type="openrouter" value="anthropic/claude-3-sonnet">anthropic/claude-3-sonnet</option>
                                 <option data-type="openrouter" value="anthropic/claude-3-opus">anthropic/claude-3-opus</option>
@@ -450,6 +454,8 @@ jQuery(function () {
                                 <option data-type="openrouter" value="anthropic/claude-3-opus:beta">anthropic/claude-3-opus:beta</option>
                                 <option data-type="openrouter" value="nousresearch/nous-hermes-2-vision-7b">nousresearch/nous-hermes-2-vision-7b</option>
                                 <option data-type="openrouter" value="google/gemini-pro-vision">google/gemini-pro-vision</option>
+                                <option data-type="openrouter" value="google/gemini-flash-1.5">google/gemini-flash-1.5</option>
+                                <option data-type="openrouter" value="liuhaotian/llava-yi-34b">liuhaotian/llava-yi-34b</option>
                                 <option data-type="ollama" value="ollama_current">[Currently selected]</option>
                                 <option data-type="ollama" value="bakllava:latest">bakllava:latest</option>
                                 <option data-type="ollama" value="llava:latest">llava:latest</option>
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 2e35ecae7..6e9236d8e 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -3725,7 +3725,7 @@ async function onModelChange() {
     if (oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) {
         if (oai_settings.max_context_unlocked) {
             $('#openai_max_context').attr('max', max_1mil);
-        } else if (value === 'gemini-1.5-pro-latest') {
+        } else if (value === 'gemini-1.5-pro-latest' || value.includes('gemini-1.5-flash')) {
             $('#openai_max_context').attr('max', max_1mil);
         } else if (value === 'gemini-ultra' || value === 'gemini-1.0-pro-latest' || value === 'gemini-pro' || value === 'gemini-1.0-ultra-latest') {
             $('#openai_max_context').attr('max', max_32k);
@@ -4285,6 +4285,8 @@ export function isImageInliningSupported() {
     // gultra just isn't being offered as multimodal, thanks google.
     const visionSupportedModels = [
         'gpt-4-vision',
+        'gemini-1.5-flash-latest',
+        'gemini-1.5-flash',
         'gemini-1.0-pro-vision-latest',
         'gemini-1.5-pro-latest',
         'gemini-pro-vision',
diff --git a/src/endpoints/backends/chat-completions.js b/src/endpoints/backends/chat-completions.js
index 5728bcf81..becfc8e07 100644
--- a/src/endpoints/backends/chat-completions.js
+++ b/src/endpoints/backends/chat-completions.js
@@ -254,7 +254,7 @@ async function sendMakerSuiteRequest(request, response) {
     };
 
     function getGeminiBody() {
-        const should_use_system_prompt = model === 'gemini-1.5-pro-latest' && request.body.use_makersuite_sysprompt;
+        const should_use_system_prompt = ['gemini-1.5-flash-latest', 'gemini-1.5-pro-latest'].includes(model) && request.body.use_makersuite_sysprompt;
         const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);
         let body = {
             contents: prompt.contents,