Merge pull request #76 from animalnots/dev

v1.13.0
animalnots · Nov 4, 2024 · 8c768cd · 8c768cd
2 parents 76223f9 + 0ddaf5c
commit 8c768cd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "better-chatgpt",
   "private": true,
-  "version": "1.12.0",
+  "version": "1.13.0",
   "type": "module",
   "homepage": "./",
   "main": "electron/index.cjs",

diff --git a/src/utils/chat.ts b/src/utils/chat.ts
@@ -62,7 +62,11 @@ const contentToMarkdown = (contents: ContentInterface[]): string => {
   let text = '';
   contents.forEach((content) => {
     if (content) {
-      text += isTextContent(content) ? content.text : isImageContent(content) ? `![image](${content.image_url.url})` : '';
+      if (isTextContent(content)) {
+        text += content.text;
+      } else if (isImageContent(content)) {
+        text += `![image](${content.image_url.url})`;
+      }
       text += "\n\n";
     }
   });

diff --git a/src/utils/messageUtils.ts b/src/utils/messageUtils.ts
@@ -35,8 +35,10 @@ export const getChatGPTEncoding = (
   const serialized = [
     messages
       .map(({ role, content }) => {
+        const textContent = content[0];
+        const text = textContent && isTextContent(textContent) ? textContent.text : '';
         return `<|im_start|>${role}${roleSep}${
-          (content[0] as TextContentInterface).text
+          text
         }<|im_end|>`;
       })
       .join(msgSep),