From d1096582a50887363554ad7f60821209326b6bbb Mon Sep 17 00:00:00 2001
From: 7lsu <a@7lsu.com>
Date: Mon, 7 Aug 2023 17:44:32 +0800
Subject: [PATCH 1/5] font family display enhance

---
 app/components/home.tsx | 3 +--
 app/styles/globals.scss | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/components/home.tsx b/app/components/home.tsx
index b3cec893e..c6829c2dc 100644
--- a/app/components/home.tsx
+++ b/app/components/home.tsx
@@ -104,8 +104,7 @@ const loadAsyncGoogleFont = () => {
     getClientConfig()?.buildMode === "export" ? remoteFontUrl : proxyFontUrl;
   linkEl.rel = "stylesheet";
   linkEl.href =
-    googleFontUrl +
-    "/css2?family=Noto+Sans+SC:wght@300;400;700;900&display=swap";
+    googleFontUrl + "/css2?family=Noto+Sans:wght@300;400;700;900&display=swap";
   document.head.appendChild(linkEl);
 };
 
diff --git a/app/styles/globals.scss b/app/styles/globals.scss
index 0417087e9..6542ca6ec 100644
--- a/app/styles/globals.scss
+++ b/app/styles/globals.scss
@@ -89,7 +89,7 @@
 html {
   height: var(--full-height);
 
-  font-family: "Noto Sans SC", "SF Pro SC", "SF Pro Text", "SF Pro Icons",
+  font-family: "Noto Sans", "SF Pro SC", "SF Pro Text", "SF Pro Icons",
     "PingFang SC", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
 }
 

From 769c2f9f49b1fd0d0e8e30b3bf579805c6259b7b Mon Sep 17 00:00:00 2001
From: Yidadaa <yidadaa@qq.com>
Date: Tue, 8 Aug 2023 21:22:41 +0800
Subject: [PATCH 2/5] feat: close #2583 do not summarize with gpt-4

---
 app/store/chat.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/store/chat.ts b/app/store/chat.ts
index f06c59481..ef68f7d9e 100644
--- a/app/store/chat.ts
+++ b/app/store/chat.ts
@@ -553,7 +553,7 @@ export const useChatStore = create<ChatStore>()(
                 date: "",
               }),
             ),
-            config: { ...modelConfig, stream: true },
+            config: { ...modelConfig, stream: true, model: "gpt-3.5-turbo" },
             onUpdate(message) {
               session.memoryPrompt = message;
             },

From 4ab9141429ba170308443284bd06c84dac027788 Mon Sep 17 00:00:00 2001
From: Yidadaa <yidadaa@qq.com>
Date: Tue, 8 Aug 2023 21:24:45 +0800
Subject: [PATCH 3/5] fix: #2564 should not clear message when error

---
 app/store/chat.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/store/chat.ts b/app/store/chat.ts
index ef68f7d9e..a61765899 100644
--- a/app/store/chat.ts
+++ b/app/store/chat.ts
@@ -332,7 +332,7 @@ export const useChatStore = create<ChatStore>()(
           },
           onError(error) {
             const isAborted = error.message.includes("aborted");
-            botMessage.content =
+            botMessage.content +=
               "\n\n" +
               prettyObject({
                 error: true,

From b14c5cd89c760ac81b555c0b4eb061c34cae6978 Mon Sep 17 00:00:00 2001
From: Yidadaa <yidadaa@qq.com>
Date: Tue, 8 Aug 2023 21:36:37 +0800
Subject: [PATCH 4/5] fix: #2485 one-time-use body

---
 app/api/common.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/api/common.ts b/app/api/common.ts
index 3146b6bd9..e5afb4d89 100644
--- a/app/api/common.ts
+++ b/app/api/common.ts
@@ -43,6 +43,8 @@ export async function requestOpenai(req: NextRequest) {
     },
     method: req.method,
     body: req.body,
+    // to fix #2485: https://stackoverflow.com/questions/55920957/cloudflare-worker-typeerror-one-time-use-body
+    redirect: "manual",
     // @ts-ignore
     duplex: "half",
     signal: controller.signal,

From 153e7ac7e4fc2ceb6ec14137812f6f26e862fd9a Mon Sep 17 00:00:00 2001
From: Ikko Eltociear Ashimine <eltociear@gmail.com>
Date: Wed, 9 Aug 2023 01:22:48 +0900
Subject: [PATCH 5/5] Fix typo in README.md

notifictions -> notifications
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f0f298fb9..55e88d90e 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ After forking the project, due to the limitations imposed by GitHub, you need to
 
 If you want to update instantly, you can check out the [GitHub documentation](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) to learn how to synchronize a forked project with upstream code.
 
-You can star or watch this project or follow author to get release notifictions in time.
+You can star or watch this project or follow author to get release notifications in time.
 
 ## Access Password