Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…

…-Web
W4ddl3 · Sep 8, 2024 · b00a60c · b00a60c
2 parents 2a09dcf + 23ac2ef
commit b00a60c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/app/client/platforms/anthropic.ts b/app/client/platforms/anthropic.ts
@@ -203,7 +203,7 @@ export class ClaudeApi implements LLMApi {
  const [tools, funcs] = usePluginStore
  .getState()
  .getAsTools(
- useChatStore.getState().currentSession().mask?.plugin as string[],
+ useChatStore.getState().currentSession().mask?.plugin || [],
  );
  return stream(
  path,

diff --git a/app/client/platforms/moonshot.ts b/app/client/platforms/moonshot.ts
@@ -125,7 +125,7 @@ export class MoonshotApi implements LLMApi {
  const [tools, funcs] = usePluginStore
  .getState()
  .getAsTools(
- useChatStore.getState().currentSession().mask?.plugin as string[],
+ useChatStore.getState().currentSession().mask?.plugin || [],
  );
  return stream(
  chatPath,

diff --git a/app/client/platforms/openai.ts b/app/client/platforms/openai.ts
@@ -244,7 +244,7 @@ export class ChatGPTApi implements LLMApi {
  const [tools, funcs] = usePluginStore
  .getState()
  .getAsTools(
- useChatStore.getState().currentSession().mask?.plugin as string[],
+ useChatStore.getState().currentSession().mask?.plugin || [],
  );
  // console.log("getAsTools", tools, funcs);
  stream(

diff --git a/app/components/markdown.tsx b/app/components/markdown.tsx
@@ -163,7 +163,7 @@ export function PreCode(props: { children: any }) {
  );
 }
 
-function CustomCode(props: { children: any }) {
+function CustomCode(props: { children: any; className?: string }) {
  const ref = useRef<HTMLPreElement>(null);
  const [collapsed, setCollapsed] = useState(true);
  const [showToggle, setShowToggle] = useState(false);
@@ -182,6 +182,7 @@ function CustomCode(props: { children: any }) {
  return (
  <>
  <code
+ className={props?.className}
  ref={ref}
  style={{
  maxHeight: collapsed ? "400px" : "none",

diff --git a/app/layout.tsx b/app/layout.tsx
@@ -41,7 +41,7 @@ export default function RootLayout({
  name="viewport"
  content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
  />
- <link rel="manifest" href="/site.webmanifest"></link>
+ <link rel="manifest" href="/site.webmanifest" crossOrigin="use-credentials"></link>
  <script src="/serviceWorkerRegister.js" defer></script>
  </head>
  <body>

diff --git a/app/store/plugin.ts b/app/store/plugin.ts
@@ -199,7 +199,7 @@ export const usePluginStore = createPersistStore(
 
  getAsTools(ids: string[]) {
  const plugins = get().plugins;
- const selected = ids
+ const selected = (ids || [])
  .map((id) => plugins[id])
  .filter((i) => i)
  .map((p) => FunctionToolService.add(p));

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
  },
  "package": {
  "productName": "NextChat",
- "version": "2.14.2"
+ "version": "2.15.1"
  },
  "tauri": {
  "allowlist": {