smartfridge/armcord
1
1
Fork 0
mirror of https://github.com/smartfrigde/armcord.git synced 2024-08-14 23:56:58 +00:00
Code Issues Projects Releases Wiki Activity

simplify version api

Browse source
This commit is contained in:
smartfrigde 2024-05-15 20:32:14 +02:00
parent 0487507bc4
commit b9bf19f059
3 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/common/version.ts
View file

@ -1,19 +1,14 @@
import {app} from "electron"; import {app} from "electron";
export const packageVersion = "3.2.0";
export function getVersion(): string { export function getVersion(): string {
return packageVersion; if ((app.getVersion() == process.versions.electron) == true) {
return "3.3.0";
}
return app.getVersion();
} }
export function getDisplayVersion(): string { export function getDisplayVersion(): string {
//Checks if the app version # has 4 sections (3.1.0.0) instead of 3 (3.1.0) / Shitty way to check if Kernel Mod is installed
if ((app.getVersion() == packageVersion) == false) {
if ((app.getVersion() == process.versions.electron) == true) { if ((app.getVersion() == process.versions.electron) == true) {
return `Dev Build (${packageVersion})`; return "Dev Build";
} else {
return `${packageVersion} [Modified]`;
}
} else {
return packageVersion;
} }
return app.getVersion();
} }

5
src/discord/ipc.ts
View file

@ -8,7 +8,7 @@ import path from "path";
import {getConfig, setConfigBulk, getConfigLocation, Settings} from "../common/config"; import {getConfig, setConfigBulk, getConfigLocation, Settings} from "../common/config";
import {setLang, getLang, getLangName} from "../common/lang"; import {setLang, getLang, getLangName} from "../common/lang";
import {sleep} from "../common/sleep"; import {sleep} from "../common/sleep";
import {getVersion, getDisplayVersion, packageVersion} from "../common/version"; import {getVersion, getDisplayVersion} from "../common/version";
import {customTitlebar} from "../main"; import {customTitlebar} from "../main";
import {createSettingsWindow} from "../settings/main"; import {createSettingsWindow} from "../settings/main";
import {splashWindow} from "../splash/main"; import {splashWindow} from "../splash/main";
@ -80,9 +80,6 @@ export function registerIpc(): void {
ipcMain.on("modInstallState", (event) => { ipcMain.on("modInstallState", (event) => {
event.returnValue = modInstallState; event.returnValue = modInstallState;
}); });
ipcMain.on("get-package-version", (event) => {
event.returnValue = packageVersion;
});
ipcMain.on("splashEnd", async () => { ipcMain.on("splashEnd", async () => {
splashWindow.close(); splashWindow.close();
if (await getConfig("startMinimized")) { if (await getConfig("startMinimized")) {

1
src/discord/preload/bridge.mts
View file

@ -57,7 +57,6 @@ contextBridge.exposeInMainWorld("armcord", {
getDisplayMediaSelector, getDisplayMediaSelector,
version: ipcRenderer.sendSync("get-app-version", "app-version"), version: ipcRenderer.sendSync("get-app-version", "app-version"),
mods: ipcRenderer.sendSync("clientmod"), mods: ipcRenderer.sendSync("clientmod"),
packageVersion: ipcRenderer.sendSync("get-package-version", "app-version"),
openSettingsWindow: () => ipcRenderer.send("openSettingsWindow") openSettingsWindow: () => ipcRenderer.send("openSettingsWindow")
}); });
let windowCallback: (arg0: object) => void; let windowCallback: (arg0: object) => void;