Merge pull request 'remove console logging, add unhandled error dialog' (#7) from dev into master

Reviewed-on: #7

electron/appInfo.js

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

electron/imageUtil.js

@@ -1,15 +0,0 @@
-async function checkImageExists(url) {
-  try {
-    const response = await fetch(url, { method: "HEAD" });
-    if (!response.ok) {
-      return false;
-    }
-    const contentType = response.headers.get("content-type");
-    if (!contentType) return false;
-    return contentType.startsWith("image/");
-  } catch (error) {
-    return false;
-  }
-}
-
-module.exports = { checkImageExists };

electron/richPresence.js

@@ -2,10 +2,7 @@ const DiscordRPC = require("discord-auto-rpc");
 const { appName, appVersion } = require("./appInfo.js");
 
 const clientId = "1032772293220384808";
-
-/** @type {DiscordRPC.AutoClient} */
 let richPresence;
-
 let intervalId;
 
 let currentStatus = {
@@ -35,7 +32,6 @@ module.exports = {
       richPresence = new DiscordRPC.AutoClient({ transport: "ipc" });
       richPresence.endlessLogin({ clientId });
       richPresence.once("ready", () => {
-        console.log("connected presence with user " + richPresence.user.username);
         richPresence.setActivity(currentStatus);
         intervalId = setInterval(() => {
           richPresence.setActivity(currentStatus);
@@ -51,17 +47,16 @@ module.exports = {
       richPresence = null;
     }
   },
-  updateStatus: ({ state, details, largeImageKey }) => {
+  updateStatus: ({ state, details }) => {
     currentStatus.state = state ?? "  ";
     currentStatus.details = details ?? "  ";
-    currentStatus.largeImageKey = largeImageKey ?? "ezppfarm";
   },
   updateVersion: (osuVersion) => {
     currentStatus.smallImageKey = osuVersion ? "osu" : "  ";
     currentStatus.smallImageText = osuVersion ? `osu! ${osuVersion}` : "  ";
   },
   update: () => {
-    if (richPresence && richPresence.user) {
+    if (richPresence) {
       richPresence.setActivity(currentStatus);
     }
   },

main.js

@@ -3,14 +3,14 @@ const { app, BrowserWindow, Menu, ipcMain, dialog, shell } = require(
   "electron",
 );
 
-/* const unhandled = require("electron-unhandled");
+const unhandled = require("electron-unhandled");
 unhandled({
   logger: console.error,
   showDialog: true,
   reportButton: () => {
     shell.openExternal("https://ez-pp.farm/discord");
   },
-}); */
+});
 
 const path = require("path");
 const serve = require("electron-serve");
@@ -46,7 +46,6 @@ const { getHwId } = require("./electron/hwidUtil");
 const { appName, appVersion } = require("./electron/appInfo");
 const { updateAvailable, releasesUrl } = require("./electron/updateCheck");
 const fkill = require("fkill");
-const { checkImageExists } = require("./electron/imageUtil");
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -97,24 +96,10 @@ function startOsuStatus() {
       if (!("player_status" in currentStatus)) return;
       if (!("status" in currentStatus.player_status)) return;
 
-      let largeImageKey = "ezppfarm";
       let details = "Idle...";
       let infoText = currentStatus.player_status.status.info_text.length > 0
         ? currentStatus.player_status.status.info_text
         : "  ";
-      if (
-        "beatmap" in currentStatus.player_status.status &&
-        currentStatus.player_status.status.beatmap !== null
-      ) {
-        const setId = currentStatus.player_status.status.beatmap.set_id;
-        const coverImage =
-          `https://assets.ppy.sh/beatmaps/${setId}/covers/list@2x.jpg`;
-        if (
-          checkImageExists(coverImage)
-        ) {
-          largeImageKey = coverImage;
-        }
-      }
 
       switch (currentStatus.player_status.status.action) {
         case 1:
@@ -159,7 +144,6 @@ function startOsuStatus() {
       richPresence.updateStatus({
         details,
         state: infoText,
-        largeImageKey,
       });
 
       richPresence.update();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezpplauncher-next",
-  "version": "2.1.1",
+  "version": "2.1.0",
   "description": "EZPPLauncher rewritten with Svelte.",
   "private": false,
   "license": "MIT",