From 981b69d37cc03fa187813a5f8d34419b8ed6614b Mon Sep 17 00:00:00 2001
From: Richard-Weiss <76665424+Richard-Weiss@users.noreply.github.com>
Date: Wed, 17 Jan 2024 21:40:17 +0100
Subject: [PATCH] feat(Bing): use env system message as default

---
 Intelligence_Questions.txt | 5 ++++-
 settings.js                | 1 +
 src/BingAIClient.js        | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Intelligence_Questions.txt b/Intelligence_Questions.txt
index e3347279..be68d832 100644
--- a/Intelligence_Questions.txt
+++ b/Intelligence_Questions.txt
@@ -88,4 +88,7 @@ State 3:
 5 liter container: 4 liter
 3 liter container: 1 liter
 2 liter container: 0 liter
-R7: GPT-4 Turbo tries to fill the 5 liter container or empty containers. Consistently solvable by Precise.
\ No newline at end of file
+R7: GPT-4 Turbo tries to fill the 5 liter container or empty containers. Consistently solvable by Precise.
+
+Q8: I have a ball in a cup in my hands and I am inside the elevator on the first floor. I turn the cup upside down and ride the elevator to the second floor. It stops at the second floor and I take the stairs to the third floor. I place my cup on the table. What floor is the ball on?
+A8: Depending on whether you turned the cup on your hand it's on the third floor between the cup and your hand. If not, it is on whichever floor the elevator is on, unless moved. If the elevator hasn't moved, it's on the second floor.
\ No newline at end of file
diff --git a/settings.js b/settings.js
index 2b3bf567..876e62e4 100644
--- a/settings.js
+++ b/settings.js
@@ -63,6 +63,7 @@ export default {
         useBase64: process.env.USE_BASE64 === 'true',
         // Set to false to disable suggestions
         showSuggestions: process.env.SHOW_SUGGESTIONS !== 'false',
+        systemMessage: process.env.SYSTEM_MESSAGE,
     },
     chatGptBrowserClient: {
         // (Optional) Support for a reverse proxy for the conversation endpoint (private API server).
diff --git a/src/BingAIClient.js b/src/BingAIClient.js
index dc4dbd60..006f9dc4 100644
--- a/src/BingAIClient.js
+++ b/src/BingAIClient.js
@@ -335,11 +335,12 @@ export default class BingAIClient {
             conversationSignature,
             clientId,
             plugins,
+            systemMessage,
         } = opts;
+        systemMessage = systemMessage || this.options.systemMessage;
 
         const {
             invocationId = 0,
-            systemMessage,
             toneStyle,
             modelVersion,
             context = jailbreakConversationId ? process.env.CONTEXT : null,