Merge branch 'Yidadaa:main' into main

This commit is contained in:
Hk-Gosuto 2023-10-10 15:14:18 +08:00 committed by GitHub
commit ae86dfbf70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 10 deletions

View File

@ -132,8 +132,7 @@ function Screen() {
const isHome = location.pathname === Path.Home; const isHome = location.pathname === Path.Home;
const isAuth = location.pathname === Path.Auth; const isAuth = location.pathname === Path.Auth;
const isMobileScreen = useMobileScreen(); const isMobileScreen = useMobileScreen();
const shouldTightBorder = const shouldTightBorder = getClientConfig()?.isApp || (config.tightBorder && !isMobileScreen);
config.tightBorder && !isMobileScreen && !getClientConfig()?.isApp;
useEffect(() => { useEffect(() => {
loadAsyncGoogleFont(); loadAsyncGoogleFont();

View File

@ -1,6 +1,3 @@
import { create } from "zustand";
import { persist } from "zustand/middleware";
import { trimTopic } from "../utils"; import { trimTopic } from "../utils";
import Locale, { getLang } from "../locales"; import Locale, { getLang } from "../locales";

View File

@ -77,7 +77,7 @@ export function limitNumber(
max: number, max: number,
defaultValue: number, defaultValue: number,
) { ) {
if (typeof x !== "number" || isNaN(x)) { if (isNaN(x)) {
return defaultValue; return defaultValue;
} }
@ -140,9 +140,7 @@ export const useAppConfig = createPersistStore(
.customModels.split(",") .customModels.split(",")
.filter((v) => !!v && v.length > 0) .filter((v) => !!v && v.length > 0)
.map((m) => ({ name: m, available: true })); .map((m) => ({ name: m, available: true }));
return get().models.concat(customModels);
const models = get().models.concat(customModels);
return models;
}, },
}), }),
{ {

View File

@ -9,7 +9,7 @@
}, },
"package": { "package": {
"productName": "ChatGPT Next Web", "productName": "ChatGPT Next Web",
"version": "2.9.8" "version": "2.9.9"
}, },
"tauri": { "tauri": {
"allowlist": { "allowlist": {