7x31/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/Yidadaa/ChatGPT-Next-Web.git synced 2025-08-24 20:12:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix version compare

Browse Source
This commit is contained in:
lloydzhou
2024-10-11 11:42:36 +08:00
parent 2eebfcf6fe
commit bd9de4dc4d
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/settings.tsx
View File

@@ -49,7 +49,7 @@ import Locale, {
changeLang, changeLang,
getLang, getLang,
} from "../locales"; } from "../locales";
import { copyToClipboard, clientUpdate } from "../utils"; import { copyToClipboard, clientUpdate, semverCompare } from "../utils";
import Link from "next/link"; import Link from "next/link";
import { import {
Anthropic, Anthropic,
@@ -585,7 +585,7 @@ export function Settings() {
const [checkingUpdate, setCheckingUpdate] = useState(false); const [checkingUpdate, setCheckingUpdate] = useState(false);
const currentVersion = updateStore.formatVersion(updateStore.version); const currentVersion = updateStore.formatVersion(updateStore.version);
const remoteId = updateStore.formatVersion(updateStore.remoteVersion); const remoteId = updateStore.formatVersion(updateStore.remoteVersion);
const hasNewVersion = currentVersion !== remoteId; const hasNewVersion = semverCompare(currentVersion, remoteId) === -1;
const updateUrl = getClientConfig()?.isApp ? RELEASE_URL : UPDATE_URL; const updateUrl = getClientConfig()?.isApp ? RELEASE_URL : UPDATE_URL;
function checkUpdate(force = false) { function checkUpdate(force = false) {

11
app/utils.ts
View File

@@ -409,3 +409,14 @@ export function clientUpdate() {
showToast(Locale.Settings.Update.Failed); showToast(Locale.Settings.Update.Failed);
}); });
} }
// https://gist.github.com/iwill/a83038623ba4fef6abb9efca87ae9ccb
export function semverCompare(a, b) {
if (a.startsWith(b + "-")) return -1;
if (b.startsWith(a + "-")) return 1;
return a.localeCompare(b, undefined, {
numeric: true,
sensitivity: "case",
caseFirst: "upper",
});
}