Merge pull request 'add dynamic beatmap images to presence' (#12) from dev into master

Reviewed-on: #12

electron/richPresence.js

@@ -2,7 +2,10 @@ const DiscordRPC = require("discord-auto-rpc");
 const { appName, appVersion } = require("./appInfo.js");
 
 const clientId = "1032772293220384808";
+
+/** @type {DiscordRPC.AutoClient} */
 let richPresence;
+
 let intervalId;
 
 let currentStatus = {
@@ -32,6 +35,7 @@ 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);
@@ -52,12 +56,12 @@ module.exports = {
     currentStatus.details = details ?? "  ";
     currentStatus.largeImageKey = largeImageKey ?? "ezppfarm";
   },
-  updateVersion: (osuVersion) => {
-    currentStatus.smallImageKey = osuVersion ? "osu" : "  ";
-    currentStatus.smallImageText = osuVersion ? `osu! ${osuVersion}` : "  ";
+  updateUser: ({ username, id }) => {
+    currentStatus.smallImageKey = id ? `https://a.ez-pp.farm/${id}` : "  ";
+    currentStatus.smallImageText = username ?? "  ";
   },
   update: () => {
-    if (richPresence) {
+    if (richPresence && richPresence.user) {
       richPresence.setActivity(currentStatus);
     }
   },

main.js

@@ -73,6 +73,25 @@ function startOsuStatus() {
     if (firstInstance) {
       if (!osuLoaded) {
         osuLoaded = true;
+
+        try {
+          const currentUserInfo = await fetch(`https://api.ez-pp.farm/get_player_info?name=${currentUser.username}&scope=info`);
+          const currentUserInfoJson = await currentUserInfo.json();
+          if ("player" in currentUserInfoJson && currentUserInfoJson.player != null) {
+            if ("info" in currentUserInfoJson.player && currentUserInfoJson.player.info != null) {
+              const id = currentUserInfoJson.player.info.id;
+              const username = currentUserInfoJson.player.info.name;
+              richPresence.updateUser({
+                id,
+                username,
+              });
+              richPresence.update();
+            }
+          }
+        } catch {
+
+        }
+
         setTimeout(() => {
           if (patch) {
             const patcherExecuteable = path.join(
@@ -107,12 +126,14 @@ function startOsuStatus() {
         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;
+        if (setId) {
+          const coverImage =
+            `https://assets.ppy.sh/beatmaps/${setId}/covers/list@2x.jpg`;
+          if (
+            checkImageExists(coverImage)
+          ) {
+            largeImageKey = coverImage;
+          }
         }
       }
 
@@ -120,6 +141,7 @@ function startOsuStatus() {
         case 1:
           details = "AFK...";
           infoText = "  ";
+          largeImageKey = "ezppfarm";
           break;
         case 2:
           details = "Playing...";
@@ -133,6 +155,7 @@ function startOsuStatus() {
         case 5:
           details = "Multiplayer: Selecting a Beatmap...";
           infoText = "  ";
+          largeImageKey = "ezppfarm";
           break;
         case 6:
           details = "Watching...";
@@ -142,10 +165,12 @@ function startOsuStatus() {
           break;
         case 9:
           details = "Submitting...";
+          largeImageKey = "ezppfarm";
           break;
         case 11:
           details = "Multiplayer: Idle...";
           infoText = "  ";
+          largeImageKey = "ezppfarm";
           break;
         case 12:
           details = "Multiplayer: Playing...";
@@ -153,6 +178,7 @@ function startOsuStatus() {
         case 13:
           details = "Browsing osu!direct...";
           infoText = "  ";
+          largeImageKey = "ezppfarm";
           break;
       }
 
@@ -402,9 +428,8 @@ function registerIPCPipes() {
           progress: Math.ceil(data.progress),
         });
         mainWindow.webContents.send("ezpplauncher:launchstatus", {
-          status: `Downloading ${data.fileName}(${formatBytes(data.loaded)}/${
-            formatBytes(data.total)
-          })...`,
+          status: `Downloading ${data.fileName}(${formatBytes(data.loaded)}/${formatBytes(data.total)
+            })...`,
         });
       });
       await uiDownloader.startDownload();
@@ -433,9 +458,8 @@ function registerIPCPipes() {
           progress: Math.ceil(data.progress),
         });
         mainWindow.webContents.send("ezpplauncher:launchstatus", {
-          status: `Downloading ${data.fileName}(${formatBytes(data.loaded)}/${
-            formatBytes(data.total)
-          })...`,
+          status: `Downloading ${data.fileName}(${formatBytes(data.loaded)}/${formatBytes(data.total)
+            })...`,
         });
       });
       await updateDownloader.startDownload();
@@ -480,9 +504,8 @@ function registerIPCPipes() {
             progress: Math.ceil(data.progress),
           });
           mainWindow.webContents.send("ezpplauncher:launchstatus", {
-            status: `Downloading ${data.fileName}(${formatBytes(data.loaded)}/${
-              formatBytes(data.total)
-            })...`,
+            status: `Downloading ${data.fileName}(${formatBytes(data.loaded)}/${formatBytes(data.total)
+              })...`,
           });
         });
         await patcherDownloader.startDownload();
@@ -554,11 +577,9 @@ function registerIPCPipes() {
           });
         }
       }
-    } catch {}
+    } catch { }
 
     const userConfig = getUserConfig(osuPath);
-    richPresence.updateVersion(await userConfig.get("LastVersion"));
-    richPresence.update();
     if (richPresence.hasPresence) {
       await userConfig.set("DiscordRichPresence", "0");
     }
@@ -579,7 +600,10 @@ function registerIPCPipes() {
       mainWindow.show();
       mainWindow.focus();
       stopOsuStatus();
-      richPresence.updateVersion();
+      richPresence.updateUser({
+        username: "  ",
+        id: undefined
+      });
       richPresence.updateStatus({
         state: "Idle in Launcher...",
         details: undefined,