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

fix config check

Browse source
This commit is contained in:
smartfrigde 2024-01-28 14:59:00 +01:00
parent 83719af693
commit 037a26ef34
3 changed files with 61 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -37,7 +37,7 @@
"@typescript-eslint/parser": "^5.59.2", "@typescript-eslint/parser": "^5.59.2",
"copyfiles": "^2.4.1", "copyfiles": "^2.4.1",
"electron": "28.1.4", "electron": "28.1.4",
"electron-builder": "^24.6.3", "electron-builder": "^24.9.1",
"eslint": "^8.40.0", "eslint": "^8.40.0",
"eslint-config-dmitmel": "github:dmitmel/eslint-config-dmitmel", "eslint-config-dmitmel": "github:dmitmel/eslint-config-dmitmel",
"eslint-plugin-node": "^11.1.0", "eslint-plugin-node": "^11.1.0",

100
pnpm-lock.yaml generated
View file

@ -44,8 +44,8 @@ devDependencies:
specifier: 28.1.4 specifier: 28.1.4
version: 28.1.4 version: 28.1.4
electron-builder: electron-builder:
specifier: ^24.6.3 specifier: ^24.9.1
version: 24.6.3 version: 24.9.1
eslint: eslint:
specifier: ^8.40.0 specifier: ^8.40.0
version: 8.40.0 version: 8.40.0
@ -67,8 +67,8 @@ devDependencies:
packages: packages:
/7zip-bin@5.1.1: /7zip-bin@5.2.0:
resolution: {integrity: sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==} resolution: {integrity: sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==}
dev: true dev: true
/@develar/schema-utils@2.6.5: /@develar/schema-utils@2.6.5:
@ -107,18 +107,19 @@ packages:
- supports-color - supports-color
dev: true dev: true
/@electron/notarize@1.2.4: /@electron/notarize@2.1.0:
resolution: {integrity: sha512-W5GQhJEosFNafewnS28d3bpQ37/s91CDWqxVchHfmv2dQSTWpOzNlUVQwYzC1ay5bChRV/A9BTL68yj0Pa+TSg==} resolution: {integrity: sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA==}
engines: {node: '>= 10.0.0'} engines: {node: '>= 10.0.0'}
dependencies: dependencies:
debug: 4.3.4 debug: 4.3.4
fs-extra: 9.1.0 fs-extra: 9.1.0
promise-retry: 2.0.1
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
dev: true dev: true
/@electron/osx-sign@1.0.4: /@electron/osx-sign@1.0.5:
resolution: {integrity: sha512-xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g==} resolution: {integrity: sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==}
engines: {node: '>=12.0.0'} engines: {node: '>=12.0.0'}
hasBin: true hasBin: true
dependencies: dependencies:
@ -132,8 +133,8 @@ packages:
- supports-color - supports-color
dev: true dev: true
/@electron/universal@1.3.4: /@electron/universal@1.4.1:
resolution: {integrity: sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg==} resolution: {integrity: sha512-lE/U3UNw1YHuowNbTmKNs9UlS3En3cPgwM5MI+agIgr/B1hSze9NdOP0qn7boZaI9Lph8IDv3/24g9IxnJP7aQ==}
engines: {node: '>=8.6'} engines: {node: '>=8.6'}
dependencies: dependencies:
'@electron/asar': 3.2.4 '@electron/asar': 3.2.4
@ -529,25 +530,25 @@ packages:
resolution: {integrity: sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==} resolution: {integrity: sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==}
dev: true dev: true
/app-builder-lib@24.6.3: /app-builder-lib@24.9.1:
resolution: {integrity: sha512-++0Zp7vcCHfXMBGVj7luFxpqvMPk5mcWeTuw7OK0xNAaNtYQTTN0d9YfWRsb1MvviTOOhyHeULWz1CaixrdrDg==} resolution: {integrity: sha512-Q1nYxZcio4r+W72cnIRVYofEAyjBd3mG47o+zms8HlD51zWtA/YxJb01Jei5F+jkWhge/PTQK+uldsPh6d0/4g==}
engines: {node: '>=14.0.0'} engines: {node: '>=14.0.0'}
dependencies: dependencies:
7zip-bin: 5.1.1 7zip-bin: 5.2.0
'@develar/schema-utils': 2.6.5 '@develar/schema-utils': 2.6.5
'@electron/notarize': 1.2.4 '@electron/notarize': 2.1.0
'@electron/osx-sign': 1.0.4 '@electron/osx-sign': 1.0.5
'@electron/universal': 1.3.4 '@electron/universal': 1.4.1
'@malept/flatpak-bundler': 0.4.0 '@malept/flatpak-bundler': 0.4.0
'@types/fs-extra': 9.0.13 '@types/fs-extra': 9.0.13
async-exit-hook: 2.0.1 async-exit-hook: 2.0.1
bluebird-lst: 1.0.9 bluebird-lst: 1.0.9
builder-util: 24.5.0 builder-util: 24.8.1
builder-util-runtime: 9.2.1 builder-util-runtime: 9.2.3
chromium-pickle-js: 0.2.0 chromium-pickle-js: 0.2.0
debug: 4.3.4 debug: 4.3.4
ejs: 3.1.8 ejs: 3.1.8
electron-publish: 24.5.0 electron-publish: 24.8.1
form-data: 4.0.0 form-data: 4.0.0
fs-extra: 10.1.0 fs-extra: 10.1.0
hosted-git-info: 4.1.0 hosted-git-info: 4.1.0
@ -558,7 +559,7 @@ packages:
minimatch: 5.1.6 minimatch: 5.1.6
read-config-file: 6.3.2 read-config-file: 6.3.2
sanitize-filename: 1.6.3 sanitize-filename: 1.6.3
semver: 7.3.8 semver: 7.5.4
tar: 6.1.12 tar: 6.1.12
temp-file: 3.4.0 temp-file: 3.4.0
transitivePeerDependencies: transitivePeerDependencies:
@ -669,8 +670,8 @@ packages:
dev: true dev: true
optional: true optional: true
/builder-util-runtime@9.2.1: /builder-util-runtime@9.2.3:
resolution: {integrity: sha512-2rLv/uQD2x+dJ0J3xtsmI12AlRyk7p45TEbE/6o/fbb633e/S3pPgm+ct+JHsoY7r39dKHnGEFk/AASRFdnXmA==} resolution: {integrity: sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==}
engines: {node: '>=12.0.0'} engines: {node: '>=12.0.0'}
dependencies: dependencies:
debug: 4.3.4 debug: 4.3.4
@ -679,14 +680,14 @@ packages:
- supports-color - supports-color
dev: true dev: true
/builder-util@24.5.0: /builder-util@24.8.1:
resolution: {integrity: sha512-STnBmZN/M5vGcv01u/K8l+H+kplTaq4PAIn3yeuufUKSpcdro0DhJWxPI81k5XcNfC//bjM3+n9nr8F9uV4uAQ==} resolution: {integrity: sha512-ibmQ4BnnqCnJTNrdmdNlnhF48kfqhNzSeqFMXHLIl+o9/yhn6QfOaVrloZ9YUu3m0k3rexvlT5wcki6LWpjTZw==}
dependencies: dependencies:
7zip-bin: 5.1.1 7zip-bin: 5.2.0
'@types/debug': 4.1.7 '@types/debug': 4.1.7
app-builder-bin: 4.0.0 app-builder-bin: 4.0.0
bluebird-lst: 1.0.9 bluebird-lst: 1.0.9
builder-util-runtime: 9.2.1 builder-util-runtime: 9.2.3
chalk: 4.1.2 chalk: 4.1.2
cross-spawn: 7.0.3 cross-spawn: 7.0.3
debug: 4.3.4 debug: 4.3.4
@ -924,12 +925,12 @@ packages:
path-type: 4.0.0 path-type: 4.0.0
dev: true dev: true
/dmg-builder@24.6.3: /dmg-builder@24.9.1:
resolution: {integrity: sha512-O7KNT7OKqtV54fMYUpdlyTOCP5DoPuRMLqMTgxxV2PO8Hj/so6zOl5o8GTs8pdDkeAhJzCFOUNB3BDhgXbUbJg==} resolution: {integrity: sha512-huC+O6hvHd24Ubj3cy2GMiGLe2xGFKN3klqVMLAdcbB6SWMd1yPSdZvV8W1O01ICzCCRlZDHiv4VrNUgnPUfbQ==}
dependencies: dependencies:
app-builder-lib: 24.6.3 app-builder-lib: 24.9.1
builder-util: 24.5.0 builder-util: 24.8.1
builder-util-runtime: 9.2.1 builder-util-runtime: 9.2.3
fs-extra: 10.1.0 fs-extra: 10.1.0
iconv-lite: 0.6.3 iconv-lite: 0.6.3
js-yaml: 4.1.0 js-yaml: 4.1.0
@ -981,16 +982,16 @@ packages:
jake: 10.8.5 jake: 10.8.5
dev: true dev: true
/electron-builder@24.6.3: /electron-builder@24.9.1:
resolution: {integrity: sha512-O6PqhRXwfxCNTXI4BlhELSeYYO6/tqlxRuy+4+xKBokQvwDDjDgZMMoSgAmanVSCuzjE7MZldI9XYrKFk+EQDw==} resolution: {integrity: sha512-v7BuakDuY6sKMUYM8mfQGrwyjBpZ/ObaqnenU0H+igEL10nc6ht049rsCw2HghRBdEwJxGIBuzs3jbEhNaMDmg==}
engines: {node: '>=14.0.0'} engines: {node: '>=14.0.0'}
hasBin: true hasBin: true
dependencies: dependencies:
app-builder-lib: 24.6.3 app-builder-lib: 24.9.1
builder-util: 24.5.0 builder-util: 24.8.1
builder-util-runtime: 9.2.1 builder-util-runtime: 9.2.3
chalk: 4.1.2 chalk: 4.1.2
dmg-builder: 24.6.3 dmg-builder: 24.9.1
fs-extra: 10.1.0 fs-extra: 10.1.0
is-ci: 3.0.1 is-ci: 3.0.1
lazy-val: 1.0.5 lazy-val: 1.0.5
@ -1013,12 +1014,12 @@ packages:
resolution: {integrity: sha512-3X99K852Yoqu9AcW50qz3ibYBWY79/pBhlMCab8ToEWS48R0T9tyxRiQhwylE7zQdXrMnx2JKqUJyMPmt5FBqA==} resolution: {integrity: sha512-3X99K852Yoqu9AcW50qz3ibYBWY79/pBhlMCab8ToEWS48R0T9tyxRiQhwylE7zQdXrMnx2JKqUJyMPmt5FBqA==}
dev: false dev: false
/electron-publish@24.5.0: /electron-publish@24.8.1:
resolution: {integrity: sha512-zwo70suH15L15B4ZWNDoEg27HIYoPsGJUF7xevLJLSI7JUPC8l2yLBdLGwqueJ5XkDL7ucYyRZzxJVR8ElV9BA==} resolution: {integrity: sha512-IFNXkdxMVzUdweoLJNXSupXkqnvgbrn3J4vognuOY06LaS/m0xvfFYIf+o1CM8if6DuWYWoQFKPcWZt/FUjZPw==}
dependencies: dependencies:
'@types/fs-extra': 9.0.13 '@types/fs-extra': 9.0.13
builder-util: 24.5.0 builder-util: 24.8.1
builder-util-runtime: 9.2.1 builder-util-runtime: 9.2.3
chalk: 4.1.2 chalk: 4.1.2
fs-extra: 10.1.0 fs-extra: 10.1.0
lazy-val: 1.0.5 lazy-val: 1.0.5
@ -1053,6 +1054,10 @@ packages:
engines: {node: '>=6'} engines: {node: '>=6'}
dev: true dev: true
/err-code@2.0.3:
resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
dev: true
/es6-error@4.1.1: /es6-error@4.1.1:
resolution: {integrity: sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==} resolution: {integrity: sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==}
requiresBuild: true requiresBuild: true
@ -2057,6 +2062,14 @@ packages:
engines: {node: '>=0.4.0'} engines: {node: '>=0.4.0'}
dev: true dev: true
/promise-retry@2.0.1:
resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==}
engines: {node: '>=10'}
dependencies:
err-code: 2.0.3
retry: 0.12.0
dev: true
/pump@3.0.0: /pump@3.0.0:
resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==} resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
dependencies: dependencies:
@ -2152,6 +2165,11 @@ packages:
lowercase-keys: 2.0.0 lowercase-keys: 2.0.0
dev: true dev: true
/retry@0.12.0:
resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
engines: {node: '>= 4'}
dev: true
/reusify@1.0.4: /reusify@1.0.4:
resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
engines: {iojs: '>=1.0.0', node: '>=0.10.0'} engines: {iojs: '>=1.0.0', node: '>=0.10.0'}

2
src/main.ts
View file

@ -28,6 +28,7 @@ import {createKeybindWindow} from "./keybindMaker/main";
export let iconPath: string; export let iconPath: string;
export let settings: any; export let settings: any;
export let customTitlebar: boolean; export let customTitlebar: boolean;
checkIfConfigIsBroken();
app.on("render-process-gone", (event, webContents, details) => { app.on("render-process-gone", (event, webContents, details) => {
if (details.reason == "crashed") { if (details.reason == "crashed") {
app.relaunch(); app.relaunch();
@ -71,7 +72,6 @@ if (!app.requestSingleInstanceLock() && getConfigSync("multiInstance") == (false
} }
// work around chrome 66 disabling autoplay by default // work around chrome 66 disabling autoplay by default
app.commandLine.appendSwitch("autoplay-policy", "no-user-gesture-required"); app.commandLine.appendSwitch("autoplay-policy", "no-user-gesture-required");
checkIfConfigIsBroken();
// WinRetrieveSuggestionsOnlyOnDemand: Work around electron 13 bug w/ async spellchecking on Windows. // WinRetrieveSuggestionsOnlyOnDemand: Work around electron 13 bug w/ async spellchecking on Windows.
// HardwareMediaKeyHandling,MediaSessionService: Prevent Discord from registering as a media service. // HardwareMediaKeyHandling,MediaSessionService: Prevent Discord from registering as a media service.
app.commandLine.appendSwitch( app.commandLine.appendSwitch(