Merge pull request #66 from animalnots/dev

Dev

package.json

@@ -1,7 +1,7 @@
 {
   "name": "better-chatgpt",
   "private": true,
-  "version": "1.9.0",
+  "version": "1.10.0",
   "type": "module",
   "homepage": "./",
   "main": "electron/index.cjs",
@@ -22,6 +22,10 @@
     {
       "name": "yaner-here <Yaner>",
       "url": "https://github.com/yaner-here"
+    },
+    {
+      "name": "nm723",
+      "url": "https://github.com/nm723"
     }
   ],
   "description": "Play and chat smarter with BetterChatGPT - an amazing open-source web app with a better UI for exploring OpenAI's ChatGPT API!",

src/components/Chat/ChatContent/Message/View/EditView.tsx

@@ -231,10 +231,7 @@ const EditView = ({
       (content) => content.type === 'image_url'
     );
 
-    if (
-      (!hasTextContent && !hasImageContent) ||
-      useStore.getState().generating
-    ) {
+    if (useStore.getState().generating) {
       return;
     }
 

src/utils/chat.ts

@@ -1,5 +1,5 @@
 import html2canvas from 'html2canvas';
-import { ChatInterface } from '@type/chat';
+import { ChatInterface, ContentInterface, isTextContent } from '@type/chat';
 
 export const formatNumber = (num: number): string => {
   return new Intl.NumberFormat('en-US', {
@@ -33,15 +33,46 @@ export const downloadImg = (imgData: string, fileName: string) => {
   link.remove();
 };
 
-// Function to convert a chat object to markdown format
-export const chatToMarkdown = (chat: ChatInterface) => {
+export const chatToMarkdown = (chat: ChatInterface): string => {
   let markdown = `# ${chat.title}\n\n`;
-  chat.messages.forEach((message) => {
-    markdown += `### **${message.role}**:\n\n${message.content}\n\n---\n\n`;
-  });
+  let i = 0;
+
+  while (i < chat.messages.length) {
+    let message = chat.messages[i];
+    let messageContent = contentToMarkdown(message.content);
+
+    while (hasUnclosedCodeBlock(messageContent) && i + 1 < chat.messages.length && chat.messages[i + 1].role === message.role) {
+      i++;
+      messageContent += contentToMarkdown(chat.messages[i].content);
+    }
+
+    if (hasUnclosedCodeBlock(messageContent)) {
+      // Close unclosed code block
+      messageContent += '\n```\n';
+    }
+
+    markdown += `### **${message.role}**:\n\n${messageContent}---\n\n`;
+    i++;
+  }
+
   return markdown;
 };
 
+const contentToMarkdown = (contents: ContentInterface[]): string => {
+  let text = '';
+  contents.forEach((content) => {
+    text += isTextContent(content) ? content.text : `![image](${content.image_url.url})`;
+    text += "\n\n";
+  });
+  return text;
+};
+
+export const hasUnclosedCodeBlock = (text: string): boolean => {
+  const codeBlockPattern = /```/g;
+  const matches = text.match(codeBlockPattern);
+  return matches ? matches.length % 2 !== 0 : false;
+};
+
 // Function to download the markdown content as a file
 export const downloadMarkdown = (markdown: string, fileName: string) => {
   const link = document.createElement('a');
@@ -65,4 +96,4 @@ export const preprocessLaTeX = (content: string) => {
     (_, equation) => `$${equation}$`
   );
   return inlineProcessedContent;
-};
+};