Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(app): use macos marketing version (#39)

hampus-fluxerddc9caff6ae3
diff --git a/fluxer_app/src-electron/common/types.ts b/fluxer_app/src-electron/common/types.ts
index 0473503ed..624401e14 100644
--- a/fluxer_app/src-electron/common/types.ts
+++ b/fluxer_app/src-electron/common/types.ts
@@ -32,6 +32,7 @@ export interface DesktopInfo {
runningUnderRosetta: boolean;
os: NodeJS.Platform;
osVersion: string;
+ systemVersion?: string;
}
export type UpdaterContext = 'user' | 'background' | 'focus';
diff --git a/fluxer_app/src-electron/main/ipc-handlers.ts b/fluxer_app/src-electron/main/ipc-handlers.ts
index 9a4acd739..40fd82fd9 100644
--- a/fluxer_app/src-electron/main/ipc-handlers.ts
+++ b/fluxer_app/src-electron/main/ipc-handlers.ts
@@ -412,6 +412,7 @@ export function registerIpcHandlers(): void {
runningUnderRosetta: detectRosettaMode(),
os: process.platform,
osVersion: os.release(),
+ systemVersion: process.getSystemVersion(),
}),
);
diff --git a/fluxer_app/src/utils/ClientInfoUtils.ts b/fluxer_app/src/utils/ClientInfoUtils.ts
index 8f805767f..ac5087e36 100644
--- a/fluxer_app/src/utils/ClientInfoUtils.ts
+++ b/fluxer_app/src/utils/ClientInfoUtils.ts
@@ -290,9 +290,11 @@ async function getOsContext(): Promise<Partial<ClientInfo>> {
default:
osName = desktopInfo.os;
}
+
+ const osVersion = normalize(desktopInfo.systemVersion ?? desktopInfo.osVersion);
return {
osName,
- osVersion: normalize(desktopInfo.osVersion),
+ osVersion,
arch: normalizeArchitectureValue(desktopInfo.arch),
};
} catch (error) {