fix: rewrite ask openAI and ask BingAI. now all code cleaned.

api/models/Message.js

@@ -31,36 +31,6 @@ module.exports = {
       return { message: 'Error saving message' };
     }
   },
-  saveBingMessage: async ({
-    messageId,
-    newMessageId,
-    conversationId,
-    parentMessageId,
-    sender,
-    text,
-    isCreatedByUser = false,
-    error
-  }) => {
-    try {
-      await Message.findOneAndUpdate(
-        { messageId },
-        {
-          messageId: newMessageId || messageId,
-          conversationId,
-          parentMessageId,
-          sender,
-          text,
-          isCreatedByUser,
-          error
-        },
-        { upsert: true, new: true }
-      );
-      return { messageId, conversationId, parentMessageId, sender, text, isCreatedByUser };
-    } catch (error) {
-      console.error(error);
-      return { message: 'Error saving message' };
-    }
-  },
   deleteMessagesSince: async ({ messageId, conversationId }) => {
     try {
       const message = await Message.findOne({ messageId }).exec();

api/models/index.js

@@ -1,10 +1,4 @@
-const {
-  getMessages,
-  saveMessage,
-  saveBingMessage,
-  deleteMessagesSince,
-  deleteMessages
-} = require('./Message');
+const { getMessages, saveMessage, deleteMessagesSince, deleteMessages } = require('./Message');
 const { getCustomGpts, updateCustomGpt, updateByLabel, deleteCustomGpts } = require('./CustomGpt');
 const { getConvoTitle, getConvo, saveConvo, updateConvo } = require('./Conversation');
 const { getPreset, getPresets, savePreset, deletePresets } = require('./Preset');
@@ -12,7 +6,6 @@ const { getPreset, getPresets, savePreset, deletePresets } = require('./Preset')
 module.exports = {
   getMessages,
   saveMessage,
-  saveBingMessage,
   deleteMessagesSince,
   deleteMessages,
 

api/models/schema/conversationPreset.js

@@ -47,14 +47,6 @@ module.exports = {
     type: Boolean,
     default: false
   },
-  jailbreakConversationId: {
-    type: String,
-    default: null
-  },
-  conversationSignature: {
-    type: String,
-    default: null
-  },
   context: {
     type: String,
     default: null
@@ -63,14 +55,6 @@ module.exports = {
     type: String,
     default: null
   },
-  clientId: {
-    type: String,
-    default: null
-  },
-  invocationId: {
-    type: Number,
-    default: 1
-  },
   toneStyle: {
     type: String,
     default: null

api/models/schema/convoSchema.js

@@ -20,7 +20,24 @@ const convoSchema = mongoose.Schema(
       default: null
     },
     messages: [{ type: mongoose.Schema.Types.ObjectId, ref: 'Message' }],
-    ...conversationPreset
+    ...conversationPreset,
+    // for bingAI only
+    jailbreakConversationId: {
+      type: String,
+      default: null
+    },
+    conversationSignature: {
+      type: String,
+      default: null
+    },
+    clientId: {
+      type: String,
+      default: null
+    },
+    invocationId: {
+      type: Number,
+      default: 1
+    }
   },
   { timestamps: true }
 );