Remove the remainings from auto launch

Remove auto launch
Fix path finding for auto-launch
2024-08-14 23:56:58 +00:00 · 2022-05-14 21:39:58 +02:00 · 2022-05-14 21:33:43 +02:00 · 2022-05-14 21:12:16 +02:00 · 2022-05-14 21:02:09 +02:00 · 2022-05-14 20:00:33 +02:00
8 changed files with 173 additions and 105 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -10,20 +10,19 @@
      "hasInstallScript": true,
      "license": "OSL-3.0",
      "dependencies": {
-        "electron-context-menu": "^3.1.2",
+        "electron-context-menu": "https://github.com/ArmCord/electron-context-menu.git",
        "v8-compile-cache": "^2.3.0",
-        "ws": "^8.5.0"
+        "ws": "^8.6.0"
      },
      "devDependencies": {
-        "@types/electron-json-storage": "^4.5.0",
-        "@types/node": "^17.0.25",
+        "@types/node": "^17.0.33",
        "@types/ws": "^8.5.3",
        "copyfiles": "^2.4.1",
-        "electron": "^18.1.0",
+        "electron": "^18.2.3",
        "electron-builder": "^23.0.3",
-        "husky": "^7.0.4",
+        "husky": "^8.0.1",
        "prettier": "^2.5.1",
-        "typescript": "^4.5.4"
+        "typescript": "^4.6.3"
      }
    },
    "node_modules/@develar/schema-utils": {
@ -231,12 +230,6 @@
        "@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",
@ -271,9 +264,9 @@
      "dev": true
    },
    "node_modules/@types/node": {
-      "version": "17.0.25",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz",
-      "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==",
+      "version": "17.0.33",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.33.tgz",
+      "integrity": "sha512-miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ==",
      "dev": true
    },
    "node_modules/@types/plist": {
@ -530,9 +523,9 @@
      }
    },
    "node_modules/async": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
      "dev": true
    },
    "node_modules/async-exit-hook": {
@ -1311,12 +1304,12 @@
      "dev": true
    },
    "node_modules/ejs": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
-      "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
+      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
      "dev": true,
      "dependencies": {
-        "jake": "^10.6.1"
+        "jake": "^10.8.5"
      },
      "bin": {
        "ejs": "bin/cli.js"
@ -1326,9 +1319,9 @@
      }
    },
    "node_modules/electron": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-18.1.0.tgz",
-      "integrity": "sha512-P55wdHNTRMo7a/agC84ZEZDYEK/pTBcQdlp8lFbHcx3mO4Kr+Im/J5p2uQgiuXtown31HqNh2paL3V0p+E6rpQ==",
+      "version": "18.2.3",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-18.2.3.tgz",
+      "integrity": "sha512-DJWX03hCRKTscsfXxmW4gmgFuseop+g+m4ml7NfOMfankD8uYyr2Xyi3Ui02inL9qZOlbLMeLVCu6jKCKs8p/w==",
      "dev": true,
      "hasInstallScript": true,
      "dependencies": {
@ -1434,8 +1427,8 @@
    },
    "node_modules/electron-context-menu": {
      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-3.1.2.tgz",
-      "integrity": "sha512-nNzu4w14n7mOR+4cLjRC9cEFqGUsAY76seOm0sw3f4OxEfX/d75m7HYekyp5b+0m7Ixy2KN/Mrljw1zLmpyV2w==",
+      "resolved": "git+ssh://git@github.com/ArmCord/electron-context-menu.git#1ec9d1e69c41f44530e2637fbe5f7d99f78b1eeb",
+      "license": "MIT",
      "dependencies": {
        "cli-truncate": "^2.1.0",
        "electron-dl": "^3.2.1",
@ -1737,12 +1730,33 @@
      }
    },
    "node_modules/filelist": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
-      "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
      "dev": true,
      "dependencies": {
-        "minimatch": "^3.0.4"
+        "minimatch": "^5.0.1"
+      }
+    },
+    "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": {
@ -2008,15 +2022,15 @@
      }
    },
    "node_modules/husky": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
-      "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
+      "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==",
      "dev": true,
      "bin": {
        "husky": "lib/bin.js"
      },
      "engines": {
-        "node": ">=12"
+        "node": ">=14"
      },
      "funding": {
        "url": "https://github.com/sponsors/typicode"
@ -2223,12 +2237,12 @@
      "dev": true
    },
    "node_modules/jake": {
-      "version": "10.8.4",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.4.tgz",
-      "integrity": "sha512-MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA==",
+      "version": "10.8.5",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
+      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
      "dev": true,
      "dependencies": {
-        "async": "0.9.x",
+        "async": "^3.2.3",
        "chalk": "^4.0.2",
        "filelist": "^1.0.1",
        "minimatch": "^3.0.4"
@ -3205,9 +3219,9 @@
      }
    },
    "node_modules/typescript": {
-      "version": "4.6.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
-      "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
+      "version": "4.6.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
+      "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==",
      "dev": true,
      "bin": {
        "tsc": "bin/tsc",
@ -3443,9 +3457,9 @@
      }
    },
    "node_modules/ws": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
+      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
      "engines": {
        "node": ">=10.0.0"
      },
@ -3697,12 +3711,6 @@
        "@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",
@ -3737,9 +3745,9 @@
      "dev": true
    },
    "@types/node": {
-      "version": "17.0.25",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz",
-      "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==",
+      "version": "17.0.33",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.33.tgz",
+      "integrity": "sha512-miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ==",
      "dev": true
    },
    "@types/plist": {
@ -3949,9 +3957,9 @@
      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="
    },
    "async": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
      "dev": true
    },
    "async-exit-hook": {
@ -4555,18 +4563,18 @@
      "dev": true
    },
    "ejs": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
-      "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
+      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
      "dev": true,
      "requires": {
-        "jake": "^10.6.1"
+        "jake": "^10.8.5"
      }
    },
    "electron": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-18.1.0.tgz",
-      "integrity": "sha512-P55wdHNTRMo7a/agC84ZEZDYEK/pTBcQdlp8lFbHcx3mO4Kr+Im/J5p2uQgiuXtown31HqNh2paL3V0p+E6rpQ==",
+      "version": "18.2.3",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-18.2.3.tgz",
+      "integrity": "sha512-DJWX03hCRKTscsfXxmW4gmgFuseop+g+m4ml7NfOMfankD8uYyr2Xyi3Ui02inL9qZOlbLMeLVCu6jKCKs8p/w==",
      "dev": true,
      "requires": {
        "@electron/get": "^1.13.0",
@ -4653,9 +4661,8 @@
      }
    },
    "electron-context-menu": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-3.1.2.tgz",
-      "integrity": "sha512-nNzu4w14n7mOR+4cLjRC9cEFqGUsAY76seOm0sw3f4OxEfX/d75m7HYekyp5b+0m7Ixy2KN/Mrljw1zLmpyV2w==",
+      "version": "git+ssh://git@github.com/ArmCord/electron-context-menu.git#1ec9d1e69c41f44530e2637fbe5f7d99f78b1eeb",
+      "from": "electron-context-menu@https://github.com/ArmCord/electron-context-menu.git",
      "requires": {
        "cli-truncate": "^2.1.0",
        "electron-dl": "^3.2.1",
@ -4897,12 +4904,32 @@
      }
    },
    "filelist": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
-      "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
      "dev": true,
      "requires": {
-        "minimatch": "^3.0.4"
+        "minimatch": "^5.0.1"
+      },
+      "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": {
@ -5109,9 +5136,9 @@
      }
    },
    "husky": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
-      "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
+      "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==",
      "dev": true
    },
    "iconv-corefoundation": {
@ -5253,12 +5280,12 @@
      "dev": true
    },
    "jake": {
-      "version": "10.8.4",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.4.tgz",
-      "integrity": "sha512-MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA==",
+      "version": "10.8.5",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
+      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
      "dev": true,
      "requires": {
-        "async": "0.9.x",
+        "async": "^3.2.3",
        "chalk": "^4.0.2",
        "filelist": "^1.0.1",
        "minimatch": "^3.0.4"
@ -6028,9 +6055,9 @@
      }
    },
    "typescript": {
-      "version": "4.6.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
-      "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
+      "version": "4.6.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
+      "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==",
      "dev": true
    },
    "unique-string": {
@ -6215,9 +6242,9 @@
      }
    },
    "ws": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
+      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
      "requires": {}
    },
    "xdg-basedir": {
--- a/package.json
+++ b/package.json
@ -23,20 +23,19 @@
  },
  "homepage": "https://github.com/armcord/armcord#readme",
  "devDependencies": {
-    "@types/electron-json-storage": "^4.5.0",
-    "@types/node": "^17.0.25",
+    "@types/node": "^17.0.33",
    "@types/ws": "^8.5.3",
    "copyfiles": "^2.4.1",
-    "electron": "^18.1.0",
+    "electron": "^18.2.3",
    "electron-builder": "^23.0.3",
-    "husky": "^7.0.4",
+    "husky": "^8.0.1",
    "prettier": "^2.5.1",
-    "typescript": "^4.5.4"
+    "typescript": "^4.6.3"
  },
  "dependencies": {
-    "electron-context-menu": "^3.1.2",
+    "electron-context-menu": "https://github.com/ArmCord/electron-context-menu.git",
    "v8-compile-cache": "^2.3.0",
-    "ws": "^8.5.0"
+    "ws": "^8.6.0"
  },
  "build": {
    "appId": "com.smartfridge.armcord",
--- a/src/content/setup.html
+++ b/src/content/setup.html
@ -96,9 +96,11 @@
                    windowStyle: "default",
                    channel: "stable",
                    armcordCSP: true,
+                    autoLaunch: true,
                    minimizeToTray: true,
                    automaticPatches: false,
                    mods: "cumcord",
+                    inviteWebsocket: true,
                    blurType: "acrylic"
                });
                setTimeout(() => window.armcordinternal.restart(), 5000);
@ -125,9 +127,11 @@
                            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);
@ -139,7 +143,9 @@
                        armcordCSP: true,
                        minimizeToTray: true,
                        automaticPatches: false,
+                        autoLaunch: true,
                        mods: "none",
+                        inviteWebsocket: true,
                        blurType: "acrylic"
                    });
                    setTimeout(() => window.armcordinternal.restart(), 500);
--- a/src/settings/main.ts
+++ b/src/settings/main.ts
@ -15,7 +15,7 @@ export function createSettingsWindow() {
    } else {
        settingsWindow = new BrowserWindow({
            width: 500,
-            height: 500,
+            height: 555,
            title: "ArmCord Settings",
            darkTheme: true,
            frame: true,
--- a/src/settings/settings.html
+++ b/src/settings/settings.html
@ -34,6 +34,12 @@
            <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>
@ -60,6 +66,7 @@
        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");
@ -76,7 +83,7 @@
                automaticPatches: document.getElementById("patches").checked,
                mods: document.getElementById("mod").value,
                blurType: "acrylic",
-                inviteWebsocket: true,
+                inviteWebsocket: document.getElementById("websocket").checked,
                doneSetup: true
            });
        });
--- a/src/tray.ts
+++ b/src/tray.ts
@ -27,6 +27,12 @@ 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 () {
@ -46,6 +52,9 @@ app.whenReady().then(async () => {
                    mainWindow.loadURL("https://discord.gg/TnhxcqynZ2");
                }
            },
+            {
+                type: "separator"
+            },
            {
                label: "Quit ArmCord",
                click: function () {
--- a/src/utils.ts
+++ b/src/utils.ts
@ -2,6 +2,7 @@ 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) {
@ -21,7 +22,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(
@ -124,7 +125,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);
@ -132,15 +133,26 @@ 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 {
-        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");
+        if (await getConfig("doneSetup") == false) {
+            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 {
+            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");
+            }
        }
    }
 }
--- a/src/window.ts
+++ b/src/window.ts
@ -2,16 +2,18 @@
 // 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} from "electron";
+import {BrowserWindow, shell, app, ipcMain, dialog, clipboard} from "electron";
 import path from "path";
-import {checkIfConfigIsBroken, firstRun, getConfig, contentPath} from "./utils";
+import {checkIfConfigIsBroken, firstRun, getConfig, contentPath, isSetup} 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,
@ -22,7 +24,7 @@ async function doAfterDefiningTheWindow() {
    checkIfConfigIsBroken();
    registerIpc();
    mainWindow.webContents.userAgent =
-        "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
+        `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
    mainWindow.webContents.setWindowOpenHandler(({url}) => {
        shell.openExternal(url);
        return {action: "deny"};
@ -44,8 +46,12 @@ 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."
@ -53,12 +59,14 @@ 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`);
@ -68,8 +76,8 @@ async function doAfterDefiningTheWindow() {
 }
 export function createCustomWindow() {
    mainWindow = new BrowserWindow({
-        width: 390,
-        height: 470,
+        width: 300,
+        height: 350,
        title: "ArmCord",
        darkTheme: true,
        icon: path.join(__dirname, "/assets/icon_transparent.png"),
Author	SHA1	Message	Date
smartfrigde	b1aac435e6	Remove the remainings from auto launch	2022-05-14 21:39:58 +02:00
smartfrigde	d2eeb054d4	Remove auto launch	2022-05-14 21:33:43 +02:00
smartfrigde	22343e00ed	Fix path finding for auto-launch	2022-05-14 21:12:16 +02:00
smartfrigde	5893f5bea9	Add auto-launch and bunch of other things	2022-05-14 21:02:09 +02:00
smartfrigde	6663b6de5f	Add missing setting to setup and settings menu	2022-05-14 20:00:33 +02:00
smartfrigde	1222a37a44	Fix image pasting	2022-05-14 19:55:06 +02:00
smartfridge	d1d7c5834c	Fix broken json	2022-05-13 21:34:22 +02:00
smartfridge	aac1df6ca9	Update Electron to 18.2.3 Fixes #112	2022-05-13 21:32:54 +02:00
smartfridge	0eeb1b3855	Update package.json	2022-05-13 21:27:09 +02:00
dependabot[bot]	dfcdd14fb2	Bump ejs from 3.1.6 to 3.1.8 (#113 ) Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.8. - [Release notes](https://github.com/mde/ejs/releases) - [Changelog](https://github.com/mde/ejs/blob/main/CHANGELOG.md) - [Commits](https://github.com/mde/ejs/compare/v3.1.6...v3.1.8) --- updated-dependencies: - dependency-name: ejs dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-05-13 21:24:07 +02:00
dependabot[bot]	9a24d44bfa	Bump ws from 8.5.0 to 8.6.0 (#106 ) Bumps [ws](https://github.com/websockets/ws) from 8.5.0 to 8.6.0. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/8.5.0...8.6.0) --- updated-dependencies: - dependency-name: ws dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-05-13 21:23:18 +02:00
dependabot[bot]	b86cb5546d	Bump husky from 7.0.4 to 8.0.1 (#108 ) Bumps [husky](https://github.com/typicode/husky) from 7.0.4 to 8.0.1. - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v7.0.4...v8.0.1) --- updated-dependencies: - dependency-name: husky dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-05-13 21:23:11 +02:00
dependabot[bot]	466597727e	Bump @types/node from 17.0.25 to 17.0.33 (#111 ) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 17.0.25 to 17.0.33. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-05-13 21:23:04 +02:00
dependabot[bot]	e3a7d9797f	Bump typescript from 4.6.3 to 4.6.4 (#104 ) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.6.3 to 4.6.4. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v4.6.3...v4.6.4) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-05-13 21:22:44 +02:00