package-lock.json

@@ -10,19 +10,20 @@
       "hasInstallScript": true,
       "license": "OSL-3.0",
       "dependencies": {
-        "electron-context-menu": "https://github.com/ArmCord/electron-context-menu.git",
+        "electron-context-menu": "^3.1.2",
         "v8-compile-cache": "^2.3.0",
-        "ws": "^8.6.0"
+        "ws": "^8.5.0"
       },
       "devDependencies": {
-        "@types/node": "^17.0.33",
+        "@types/electron-json-storage": "^4.5.0",
+        "@types/node": "^17.0.25",
         "@types/ws": "^8.5.3",
         "copyfiles": "^2.4.1",
-        "electron": "^18.2.3",
+        "electron": "^18.1.0",
         "electron-builder": "^23.0.3",
-        "husky": "^8.0.1",
+        "husky": "^7.0.4",
         "prettier": "^2.5.1",
-        "typescript": "^4.6.3"
+        "typescript": "^4.5.4"
       }
     },
     "node_modules/@develar/schema-utils": {
@@ -230,6 +231,12 @@
         "@types/ms": "*"
       }
     },
+    "node_modules/@types/electron-json-storage": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@types/electron-json-storage/-/electron-json-storage-4.5.0.tgz",
+      "integrity": "sha512-wzDtkJHEENo4yLARfPjdYD6Foa7IORXFiNYLacZ6lJThkrGUWh5vlSSMu925ov5zv8tQHtajn2O7BpHcBtqU3g==",
+      "dev": true
+    },
     "node_modules/@types/fs-extra": {
       "version": "9.0.13",
       "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
@@ -264,9 +271,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "17.0.33",
+      "version": "17.0.25",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.33.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz",
-      "integrity": "sha512-miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ==",
+      "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==",
       "dev": true
     },
     "node_modules/@types/plist": {
@@ -523,9 +530,9 @@
       }
     },
     "node_modules/async": {
-      "version": "3.2.3",
+      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
+      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
       "dev": true
     },
     "node_modules/async-exit-hook": {
@@ -1304,12 +1311,12 @@
       "dev": true
     },
     "node_modules/ejs": {
-      "version": "3.1.8",
+      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
-      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
+      "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
       "dev": true,
       "dependencies": {
-        "jake": "^10.8.5"
+        "jake": "^10.6.1"
       },
       "bin": {
         "ejs": "bin/cli.js"
@@ -1319,9 +1326,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "18.2.3",
+      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-18.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-18.1.0.tgz",
-      "integrity": "sha512-DJWX03hCRKTscsfXxmW4gmgFuseop+g+m4ml7NfOMfankD8uYyr2Xyi3Ui02inL9qZOlbLMeLVCu6jKCKs8p/w==",
+      "integrity": "sha512-P55wdHNTRMo7a/agC84ZEZDYEK/pTBcQdlp8lFbHcx3mO4Kr+Im/J5p2uQgiuXtown31HqNh2paL3V0p+E6rpQ==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -1427,8 +1434,8 @@
     },
     "node_modules/electron-context-menu": {
       "version": "3.1.2",
-      "resolved": "git+ssh://git@github.com/ArmCord/electron-context-menu.git#1ec9d1e69c41f44530e2637fbe5f7d99f78b1eeb",
+      "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-3.1.2.tgz",
-      "license": "MIT",
+      "integrity": "sha512-nNzu4w14n7mOR+4cLjRC9cEFqGUsAY76seOm0sw3f4OxEfX/d75m7HYekyp5b+0m7Ixy2KN/Mrljw1zLmpyV2w==",
       "dependencies": {
         "cli-truncate": "^2.1.0",
         "electron-dl": "^3.2.1",
@@ -1730,33 +1737,12 @@
       }
     },
     "node_modules/filelist": {
-      "version": "1.0.4",
+      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
-      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
       "dev": true,
       "dependencies": {
-        "minimatch": "^5.0.1"
+        "minimatch": "^3.0.4"
-      }
-    },
-    "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/filelist/node_modules/minimatch": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
       }
     },
     "node_modules/form-data": {
@@ -2022,15 +2008,15 @@
       }
     },
     "node_modules/husky": {
-      "version": "8.0.1",
+      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
-      "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==",
+      "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==",
       "dev": true,
       "bin": {
         "husky": "lib/bin.js"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/typicode"
@@ -2237,12 +2223,12 @@
       "dev": true
     },
     "node_modules/jake": {
-      "version": "10.8.5",
+      "version": "10.8.4",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.4.tgz",
-      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
+      "integrity": "sha512-MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA==",
       "dev": true,
       "dependencies": {
-        "async": "^3.2.3",
+        "async": "0.9.x",
         "chalk": "^4.0.2",
         "filelist": "^1.0.1",
         "minimatch": "^3.0.4"
@@ -3219,9 +3205,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.6.4",
+      "version": "4.6.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
-      "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==",
+      "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -3457,9 +3443,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.6.0",
+      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
+      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -3711,6 +3697,12 @@
         "@types/ms": "*"
       }
     },
+    "@types/electron-json-storage": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@types/electron-json-storage/-/electron-json-storage-4.5.0.tgz",
+      "integrity": "sha512-wzDtkJHEENo4yLARfPjdYD6Foa7IORXFiNYLacZ6lJThkrGUWh5vlSSMu925ov5zv8tQHtajn2O7BpHcBtqU3g==",
+      "dev": true
+    },
     "@types/fs-extra": {
       "version": "9.0.13",
       "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
@@ -3745,9 +3737,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "17.0.33",
+      "version": "17.0.25",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.33.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz",
-      "integrity": "sha512-miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ==",
+      "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==",
       "dev": true
     },
     "@types/plist": {
@@ -3957,9 +3949,9 @@
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="
     },
     "async": {
-      "version": "3.2.3",
+      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
+      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
       "dev": true
     },
     "async-exit-hook": {
@@ -4563,18 +4555,18 @@
       "dev": true
     },
     "ejs": {
-      "version": "3.1.8",
+      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
-      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
+      "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
       "dev": true,
       "requires": {
-        "jake": "^10.8.5"
+        "jake": "^10.6.1"
       }
     },
     "electron": {
-      "version": "18.2.3",
+      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-18.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-18.1.0.tgz",
-      "integrity": "sha512-DJWX03hCRKTscsfXxmW4gmgFuseop+g+m4ml7NfOMfankD8uYyr2Xyi3Ui02inL9qZOlbLMeLVCu6jKCKs8p/w==",
+      "integrity": "sha512-P55wdHNTRMo7a/agC84ZEZDYEK/pTBcQdlp8lFbHcx3mO4Kr+Im/J5p2uQgiuXtown31HqNh2paL3V0p+E6rpQ==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.13.0",
@@ -4661,8 +4653,9 @@
       }
     },
     "electron-context-menu": {
-      "version": "git+ssh://git@github.com/ArmCord/electron-context-menu.git#1ec9d1e69c41f44530e2637fbe5f7d99f78b1eeb",
+      "version": "3.1.2",
-      "from": "electron-context-menu@https://github.com/ArmCord/electron-context-menu.git",
+      "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-3.1.2.tgz",
+      "integrity": "sha512-nNzu4w14n7mOR+4cLjRC9cEFqGUsAY76seOm0sw3f4OxEfX/d75m7HYekyp5b+0m7Ixy2KN/Mrljw1zLmpyV2w==",
       "requires": {
         "cli-truncate": "^2.1.0",
         "electron-dl": "^3.2.1",
@@ -4904,32 +4897,12 @@
       }
     },
     "filelist": {
-      "version": "1.0.4",
+      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
-      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
       "dev": true,
       "requires": {
-        "minimatch": "^5.0.1"
+        "minimatch": "^3.0.4"
-      },
-      "dependencies": {
-        "brace-expansion": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-          "dev": true,
-          "requires": {
-            "balanced-match": "^1.0.0"
-          }
-        },
-        "minimatch": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-          "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^2.0.1"
-          }
-        }
       }
     },
     "form-data": {
@@ -5136,9 +5109,9 @@
       }
     },
     "husky": {
-      "version": "8.0.1",
+      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
-      "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==",
+      "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==",
       "dev": true
     },
     "iconv-corefoundation": {
@@ -5280,12 +5253,12 @@
       "dev": true
     },
     "jake": {
-      "version": "10.8.5",
+      "version": "10.8.4",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.4.tgz",
-      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
+      "integrity": "sha512-MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA==",
       "dev": true,
       "requires": {
-        "async": "^3.2.3",
+        "async": "0.9.x",
         "chalk": "^4.0.2",
         "filelist": "^1.0.1",
         "minimatch": "^3.0.4"
@@ -6055,9 +6028,9 @@
       }
     },
     "typescript": {
-      "version": "4.6.4",
+      "version": "4.6.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
-      "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==",
+      "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
       "dev": true
     },
     "unique-string": {
@@ -6242,9 +6215,9 @@
       }
     },
     "ws": {
-      "version": "8.6.0",
+      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
+      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
       "requires": {}
     },
     "xdg-basedir": {

package.json

@@ -23,19 +23,20 @@
   },
   "homepage": "https://github.com/armcord/armcord#readme",
   "devDependencies": {
-    "@types/node": "^17.0.33",
+    "@types/electron-json-storage": "^4.5.0",
+    "@types/node": "^17.0.25",
     "@types/ws": "^8.5.3",
     "copyfiles": "^2.4.1",
-    "electron": "^18.2.3",
+    "electron": "^18.1.0",
     "electron-builder": "^23.0.3",
-    "husky": "^8.0.1",
+    "husky": "^7.0.4",
     "prettier": "^2.5.1",
-    "typescript": "^4.6.3"
+    "typescript": "^4.5.4"
   },
   "dependencies": {
-    "electron-context-menu": "https://github.com/ArmCord/electron-context-menu.git",
+    "electron-context-menu": "^3.1.2",
     "v8-compile-cache": "^2.3.0",
-    "ws": "^8.6.0"
+    "ws": "^8.5.0"
   },
   "build": {
     "appId": "com.smartfridge.armcord",

src/content/setup.html

@@ -96,11 +96,9 @@
                     windowStyle: "default",
                     channel: "stable",
                     armcordCSP: true,
-                    autoLaunch: true,
                     minimizeToTray: true,
                     automaticPatches: false,
                     mods: "cumcord",
-                    inviteWebsocket: true,
                     blurType: "acrylic"
                 });
                 setTimeout(() => window.armcordinternal.restart(), 5000);
@@ -127,11 +125,9 @@
                             windowStyle: "default",
                             channel: options.channel,
                             armcordCSP: true,
-                            autoLaunch: true,
                             minimizeToTray: true,
                             automaticPatches: false,
                             mods: options.mod,
-                            inviteWebsocket: true,
                             blurType: "acrylic"
                         });
                         setTimeout(() => window.armcordinternal.restart(), 500);
@@ -143,9 +139,7 @@
                         armcordCSP: true,
                         minimizeToTray: true,
                         automaticPatches: false,
-                        autoLaunch: true,
                         mods: "none",
-                        inviteWebsocket: true,
                         blurType: "acrylic"
                     });
                     setTimeout(() => window.armcordinternal.restart(), 500);

src/settings/main.ts

@@ -15,7 +15,7 @@ export function createSettingsWindow() {
     } else {
         settingsWindow = new BrowserWindow({
             width: 500,
-            height: 555,
+            height: 500,
             title: "ArmCord Settings",
             darkTheme: true,
             frame: true,

src/settings/settings.html

@@ -34,12 +34,6 @@
             <input class="tgl tgl-light left" id="patches" type="checkbox" />
             <label class="tgl-btn left" for="patches"></label>
         </div>
-        <br />
-        <div class="switch">
-            <label class="header">Invite Websocket</label>
-            <input class="tgl tgl-light left" id="websocket" type="checkbox" />
-            <label class="tgl-btn left" for="websocket"></label>
-        </div>
         <div class="switch">
             <select name="channel" id="channel" class="left">
                 <option value="stable">Stable</option>
@@ -66,7 +60,6 @@
         async function loadSettings() {
             document.getElementById("csp").checked = await settings.get("armcordCSP");
             document.getElementById("tray").checked = await settings.get("minimizeToTray");
-            document.getElementById("websocket").checked = await settings.get("inviteWebsocket");
             document.getElementById("patches").value = await settings.get("automaticPatches");
             document.getElementById("mod").value = await settings.get("mods");
             document.getElementById("channel").value = await settings.get("channel");
@@ -83,7 +76,7 @@
                 automaticPatches: document.getElementById("patches").checked,
                 mods: document.getElementById("mod").value,
                 blurType: "acrylic",
-                inviteWebsocket: document.getElementById("websocket").checked,
+                inviteWebsocket: true,
                 doneSetup: true
             });
         });

src/tray.ts

@@ -27,12 +27,6 @@ app.whenReady().then(async () => {
     } else {
         tray = new Tray(path.join(__dirname, "../", "/assets/ac_plug.png"));
         const contextMenu = Menu.buildFromTemplate([
-            {
-                label: "ArmCord",
-            },
-            {
-                type: "separator"
-            },
             {
                 label: "Open ArmCord",
                 click: function () {
@@ -52,9 +46,6 @@ app.whenReady().then(async () => {
                     mainWindow.loadURL("https://discord.gg/TnhxcqynZ2");
                 }
             },
-            {
-                type: "separator"
-            },
             {
                 label: "Quit ArmCord",
                 click: function () {

src/utils.ts

@@ -2,7 +2,6 @@ import * as fs from "fs";
 import {app, dialog} from "electron";
 import path from "path";
 export var firstRun: boolean;
-export var isSetup: boolean;
 export var contentPath: string;
 //utillity functions that are used all over the codebase or just too obscure to be put in the file used in
 export function addStyle(styleString: string) {
@@ -22,7 +21,7 @@ export async function sleep(ms: number) {
 }
 
 export async function checkIfConfigIsBroken() {
-    if ((await getConfig("0")) == "d") {
+    if (await getConfig("0") == "d") {
         console.log("Detected a corrupted config");
         setup();
         dialog.showErrorBox(
@@ -125,7 +124,7 @@ export async function checkIfConfigExists() {
     const userDataPath = app.getPath("userData");
     const storagePath = path.join(userDataPath, "/storage/");
     const settingsFile = storagePath + "settings.json";
-
+    
     if (!fs.existsSync(settingsFile)) {
         if (!fs.existsSync(storagePath)) {
             fs.mkdirSync(storagePath);
@@ -133,26 +132,15 @@ export async function checkIfConfigExists() {
         }
         console.log("First run of the ArmCord. Starting setup.");
         setup();
-        isSetup = true;
         contentPath = path.join(__dirname, "/content/setup.html");
         if (!contentPath.includes("ts-out")) {
             contentPath = path.join(__dirname, "/ts-out/content/setup.html");
         }
     } else {
-        if (await getConfig("doneSetup") == false) {
+        console.log("ArmCord has been run before. Skipping setup.");
-            console.log("First run of the ArmCord. Starting setup.");
+        contentPath = path.join(__dirname, "/content/splash.html");
-            setup();
+        if (!contentPath.includes("ts-out")) {
-            isSetup = true;
+            contentPath = path.join(__dirname, "/ts-out/content/splash.html");
-            contentPath = path.join(__dirname, "/content/setup.html");
-            if (!contentPath.includes("ts-out")) {
-                contentPath = path.join(__dirname, "/ts-out/content/setup.html");
-            }
-        } else {
-            console.log("ArmCord has been run before. Skipping setup.");
-            contentPath = path.join(__dirname, "/content/splash.html");
-            if (!contentPath.includes("ts-out")) {
-                contentPath = path.join(__dirname, "/ts-out/content/splash.html");
-            }
         }
     }
 }

src/window.ts

@@ -2,18 +2,16 @@
 // I had to add most of the window creation code here to split both into seperete functions
 // WHY? Because I can't use the same code for both due to annoying bug with value `frame` not responding to variables
 // I'm sorry for this mess but I'm not sure how to fix it.
-import {BrowserWindow, shell, app, ipcMain, dialog, clipboard} from "electron";
+import {BrowserWindow, shell, app, ipcMain, dialog} from "electron";
 import path from "path";
-import {checkIfConfigIsBroken, firstRun, getConfig, contentPath, isSetup} from "./utils";
+import {checkIfConfigIsBroken, firstRun, getConfig, contentPath} from "./utils";
 import {registerIpc} from "./ipc";
 import startServer from "./socket"
 import contextMenu from "electron-context-menu";
-import os from "os";
 export var icon: string;
 export let mainWindow: BrowserWindow;
 export let inviteWindow: BrowserWindow;
 let guestWindows: BrowserWindow[] = [];
-
 contextMenu({
     showSaveImageAs: true,
     showCopyImageAddress: true,
@@ -24,7 +22,7 @@ async function doAfterDefiningTheWindow() {
     checkIfConfigIsBroken();
     registerIpc();
     mainWindow.webContents.userAgent =
-        `Mozilla/5.0 (X11; ${os.type()} ${os.arch()}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36`; //fake useragent for screenshare to work
+        "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36"; //fake useragent for screenshare to work
     mainWindow.webContents.setWindowOpenHandler(({url}) => {
         shell.openExternal(url);
         return {action: "deny"};
@@ -46,12 +44,8 @@ async function doAfterDefiningTheWindow() {
     if (await getConfig("inviteWebsocket") == true) {
         startServer()
     }
-    
     try {
         mainWindow.loadFile(contentPath);
-        if (isSetup) {
-            mainWindow.setSize(390, 470);
-        }
     } catch (e) {
         console.log(
             "Major error detected while starting up. User is most likely on Windows platform. Fallback to alternative startup."
@@ -59,14 +53,12 @@ async function doAfterDefiningTheWindow() {
         console.log(process.platform);
         if (process.platform === "win32") {
             if (firstRun) {
-                mainWindow.setSize(390, 470);
                 mainWindow.loadURL(`file://${__dirname}/content/setup.html`);
             } else {
                 mainWindow.loadURL(`file://${__dirname}/content/splash.html`);
             }
         } else {
             if (firstRun) {
-                mainWindow.setSize(390, 470);
                 mainWindow.loadURL(`file://${__dirname}/ts-out/content/setup.html`);
             } else {
                 mainWindow.loadURL(`file://${__dirname}/ts-out/content/splash.html`);
@@ -76,8 +68,8 @@ async function doAfterDefiningTheWindow() {
 }
 export function createCustomWindow() {
     mainWindow = new BrowserWindow({
-        width: 300,
+        width: 390,
-        height: 350,
+        height: 470,
         title: "ArmCord",
         darkTheme: true,
         icon: path.join(__dirname, "/assets/icon_transparent.png"),