adding sydney in progress. only uses jailbreakConvoId and parentMsgId

client/src/components/Conversations/Conversation.jsx

@@ -16,7 +16,7 @@ export default function Conversation({
   title = 'New conversation',
   bingData,
   chatGptLabel = null,
-  promptPrefix = null,
+  promptPrefix = null
 }) {
   const [renaming, setRenaming] = useState(false);
   const [titleInput, setTitleInput] = useState(title);
@@ -34,11 +34,17 @@ export default function Conversation({
     const convo = { title, error: false, conversationId: id, chatGptLabel, promptPrefix };
 
     if (bingData) {
-      const { conversationSignature, jailbreakConversationId, clientId, invocationId } = bingData;
+      const {
+        parentMessageId,
+        conversationSignature,
+        jailbreakConversationId,
+        clientId,
+        invocationId
+      } = bingData;
       dispatch(
         setConversation({
           ...convo,
-          parentMessageId: null,
+          parentMessageId: parentMessageId || null,
           jailbreakConversationId,
           conversationSignature,
           clientId,

client/src/components/Main/TextChat.jsx

@@ -46,8 +46,10 @@ export default function TextChat({ messages }) {
         setMessages([...messages, currentMsg, { sender, text: data.text || data.response }])
       );
 
+      const isBing = model === 'bingai' || model === 'sydney';
+
       if (
-        model !== 'bingai' &&
+        !isBing &&
         convo.conversationId === null &&
         convo.parentMessageId === null
       ) {
@@ -66,13 +68,15 @@ export default function TextChat({ messages }) {
           })
         );
       } else if (
-        model === 'bingai' &&
+        isBing &&
         convo.conversationId === null &&
         convo.invocationId === null
       ) {
+        console.log('Bing data:', data)
         const {
           title,
           jailbreakConversationId,
+          parentMessageId,
           conversationSignature,
           clientId,
           conversationId,
@@ -82,11 +86,11 @@ export default function TextChat({ messages }) {
           setConversation({
             title,
             jailbreakConversationId,
+            parentMessageId: parentMessageId || null,
             conversationSignature,
             clientId,
             conversationId,
             invocationId,
-            parentMessageId: null
           })
         );
       }
@@ -94,24 +98,6 @@ export default function TextChat({ messages }) {
       dispatch(setSubmitState(false));
     };
 
-    // const convoHandler = (data) => {
-    //   const { conversationId, id, invocationId } = data;
-    //   const conversationData = {
-    //     title: data.title,
-    //     conversationId,
-    //     parentMessageId:
-    //       model !== 'bingai' && !convo.conversationId && !convo.parentMessageId ? id : null,
-    //     conversationSignature:
-    //       model === 'bingai' && !convo.conversationId ? data.conversationSignature : null,
-    //     clientId: model === 'bingai' && !convo.conversationId ? data.clientId : null,
-    //     // invocationId: model === 'bingai' && !convo.conversationId ? data.invocationId : null
-    //     invocationId: invocationId ? invocationId : null
-    //   };
-    //   dispatch(setMessages([...messages, currentMsg, { sender: model, text: data.text || data.response }]));
-    //   dispatch(setConversation(conversationData));
-    //   dispatch(setSubmitState(false));
-    // };
-
     const errorHandler = (event) => {
       console.log('Error:', event);
       const errorResponse = {

client/src/components/Messages/Message.jsx

@@ -48,9 +48,12 @@ export default function Message({
   const bgColors = {
     chatgpt: 'rgb(16, 163, 127)',
     chatgptBrowser: 'rgb(25, 207, 207)',
-    bingai: ''
+    bingai: '',
+    sydney: 'rgb(214, 255, 255)',
   };
 
+  const isBing = sender === 'bingai' || sender === 'sydney';
+
   let icon = `${sender}:`;
   let backgroundColor = bgColors[sender];
 
@@ -59,13 +62,13 @@ export default function Message({
       'w-full border-b border-black/10 bg-gray-50 dark:border-gray-900/50 text-gray-800 dark:text-gray-100 group bg-gray-100 dark:bg-[#444654]';
   }
 
-  if ((notUser && backgroundColor) || sender === 'bingai') {
+  if ((notUser && backgroundColor) || isBing) {
     icon = (
       <div
         style={{ backgroundColor }}
         className="relative flex h-[30px] w-[30px] items-center justify-center rounded-sm p-1 text-white"
       >
-        {sender === 'bingai' ? <BingIcon /> : <GPTIcon />}
+        {isBing ? <BingIcon /> : <GPTIcon />}
         {error && (
           <span className="absolute right-0 top-[20px] -mr-2 flex h-4 w-4 items-center justify-center rounded-full border border-white bg-red-500 text-[10px] text-white">
             !

client/src/components/Models/ModelMenu.jsx

@@ -126,8 +126,9 @@ export default function ModelMenu() {
     'dark:disabled:hover:bg-transparent'
   ];
 
+  const isBing = model === 'bingai' || model === 'sydney';
   const colorProps = model === 'chatgpt' ? chatgptColorProps : defaultColorProps;
-  const icon = model === 'bingai' ? <BingIcon button={true} /> : <GPTIcon button={true} />;
+  const icon = isBing ? <BingIcon button={true} /> : <GPTIcon button={true} />;
 
   return (
     <Dialog onOpenChange={onOpenChange}>