Merge branch 'gridtracker-rich-presence' into rich-presence

package.nw/lib/gt.js

@@ -2,8 +2,11 @@
 // All rights reserved.
 // See LICENSE for more information.
 const pjson = require("./package.json");
-var gtVersionStr = pjson.version
-var gtVersion = parseInt(gtVersionStr.replace(/\./g, ""));
+const Discord = require("discord-urpc");
+
+let myDiscord; // Here will Discord Rich Presence be stored.
+
+var gtVersion = parseInt(pjson.version.replace(/\./g, ""));
 var gtBeta = pjson.betaVersion;
 
 var g_startVersion = 0;
@@ -789,6 +792,7 @@ function toggleOffline()
   if (g_mapSettings.offlineMode == true)
   {
     g_mapSettings.offlineMode = false;
+    myDiscord = new Discord({ clientID: "855974200367644692", debug: true });
     offlineImg.src = g_mapImageArray[1];
     conditionsButton.style.display = "inline-block";
     gtFlagButton.style.display = "inline-block";
@@ -828,6 +832,7 @@ function toggleOffline()
   else
   {
     g_mapSettings.offlineMode = true;
+    myDiscord = null;
     offlineImg.src = g_mapImageArray[0];
     conditionsButton.style.display = "none";
 
@@ -3131,27 +3136,27 @@ function updateDiscord()
 {
   if (g_mapSettings.offlineMode == false)
   {
-    const Discord = require("discord-urpc");
-    const myDiscord = new Discord({ clientID: "855974200367644692", debug: true });
     g_discordState = myBand + " " + myMode;
-    myDiscord.on("ready", () =>
+
+    const args = {
+      pid: process.pid,
+      activity: {
+        state: "On-Air",
+        details: g_discordState,
+        timestamps: {
+          start: Date.now() / 1000
+        },
+        assets: {
+          large_image: "gridtracker"
+        },
+        instance: false
+      }
+    };
+
+    if (myDiscord != null) 
     {
-      const args = {
-        pid: process.pid,
-        activity: {
-          state: "On-Air",
-          details: g_discordState,
-          timestamps: {
-            start: Date.now() / 1000
-          },
-          assets: {
-            large_image: "gridtracker"
-          },
-          instance: false
-        }
-      };
       myDiscord.send("SET_ACTIVITY", args);
-    })
+    }
   }
 }