fix building scripts, update electron

app.js

@@ -91,7 +91,7 @@ const run = () => {
                     rpcOsuVersion = splitArray[0];
                     currentMap = splitArray[1];
                     if (currentMap.endsWith(".osu")) {
-                        rpc.updateState("Editing...");
+                        rpc.updateState("Editing/Modding...");
                         currentMap = currentMap.substring(0, currentMap.length - 4);
                     }
                     else rpc.updateState("Playing...");

appInfo.js

@@ -1,4 +1,4 @@
 const appName = "EZPPLauncher"
-const appVersion = "1.1.1";
+const appVersion = "1.1.2";
 
 module.exports = { appName, appVersion };

discordPresence.js

@@ -7,13 +7,7 @@ let client = undefined;
 let lastState = "Idle in Launcher...";
 let presenceEnabled = true;
 let startDate = new Date();
-let lastActivity = {
+const actionButtons = [
-    details: "  ",
-    state: lastState,
-    startTimestamp: startDate,
-    largeImageKey: "ezppfarm",
-    largeImageText: appInfo.appName + " " + appInfo.appVersion,
-    buttons: [
     {
         label: "Download the Launcher",
         url: "https://git.ez-pp.farm/EZPPFarm/EZPPLauncher/releases/latest"
@@ -22,7 +16,14 @@ let lastActivity = {
         label: "Join EZPPFarm",
         url: "https://ez-pp.farm/discord"
     }
-    ],
+]
+let lastActivity = {
+    details: "  ",
+    state: lastState,
+    startTimestamp: startDate,
+    largeImageKey: "ezppfarm",
+    largeImageText: appInfo.appName + " " + appInfo.appVersion,
+    buttons: actionButtons,
     instance: false,
 };
 
@@ -53,16 +54,7 @@ module.exports = {
             smallImageText: osuVersion ? osuVersion : "  ",
             largeImageKey: "ezppfarm",
             largeImageText: appInfo.appName + " " + appInfo.appVersion,
-            buttons: [
+            buttons: actionButtons,
-                {
-                    label: "Download the Launcher",
-                    url: "https://ez-pp.farm/download"
-                },
-                {
-                    label: "Join EZPPFarm",
-                    url: "https://discord.com/invite/g8Bh7RaKPg"
-                }
-            ],
             instance: false,
         }
     }

ezppUtil.js

@@ -1,6 +1,6 @@
 const axios = require('axios').default;
 
-const loginCheckEndpoint = 'https://new.ez-pp.farm/login/check';
+const loginCheckEndpoint = 'https://ez-pp.farm/login/check';
 
 const performLogin = async (username, password) => {
     const result = await axios.post(loginCheckEndpoint, { username, password });

html/index.html

@@ -65,8 +65,9 @@
                                     <div class="launch-button-section">
                                         <button class="btn btn-lg btn-launch btn-accent" id="launch-btn">Launch</button>
                                         <div class="patch-checkbox" style="display: none;">
-                                            <input type="checkbox" id="enablePatching" disabled/>
+                                            <input type="checkbox" id="enablePatching" disabled />
-                                            <label for="enablePatching" style="display: initial;">enable Patching</label>
+                                            <label for="enablePatching" style="display: initial;">enable
+                                                Patching</label>
                                         </div>
                                     </div>
                                 </div>
@@ -114,6 +115,7 @@
         </div>
     </main>
 </body>
+
 <script type="text/javascript" src="../assets/mdb.min.js"></script>
 
 </html>

osuUtil.js

@@ -90,8 +90,10 @@ async function filesThatNeedUpdate(osuPath, updateFiles) {
         const fileHash = updatedFile.file_hash;
         const fileURL = updatedFile.url_full;
 
+        if (ignoredOsuEntities.includes(fileName)) continue;
+
         const fileOnDisk = path.join(osuPath, fileName);
-        if (await fu.existsAsync(fileOnDisk) && !ignoredOsuEntities.includes(fileName)) {
+        if (await fu.existsAsync(fileOnDisk)) {
             const binaryFileContents = await fs.promises.readFile(fileOnDisk);
             const existingFileMD5 = crypto.createHash("md5").update(binaryFileContents).digest("hex");
             if (existingFileMD5.toLowerCase() != fileHash.toLowerCase()) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezpplauncher",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "app.js",
   "license": "MIT",
   "author": "HorizonCode",
@@ -33,17 +33,15 @@
   "scripts": {
     "start": "electron .",
     "rebuild": "electron-rebuild -f -w get-window-by-name",
-    "pack-win": "electron-builder --x64",
+    "pack-win": "electron-builder --win --arm64 --x64",
-    "pack-win32": "electron-builder --ia32",
+    "pack-linux": "electron-builder --linux --arm64 --x64",
-    "pack-winarm": "electron-builder --arm64",
+    "pack-mac": "electron-builder --mac --arm64 --x64",
-    "pack-linux": "electron-builder --dir --linux --ia32 --arm64 --x64",
-    "pack-mac": "electron-builder --dir --mac --ia32 --arm64 --x64",
     "dist": "electron-builder"
   },
   "devDependencies": {
-    "electron": "^21.1.1",
+    "electron": "^24.2.0",
-    "electron-builder": "^23.0.3",
+    "electron-builder": "^23.6.0",
-    "electron-packager": "^15.5.1",
+    "electron-packager": "^17.1.1",
     "electron-rebuild": "^3.2.9"
   },
   "dependencies": {