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
+const Discord = require("discord-urpc");
-var gtVersion = parseInt(gtVersionStr.replace(/\./g, ""));
+
+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,11 +3136,8 @@ 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: {
@@ -3150,8 +3152,11 @@ function updateDiscord()
         instance: false
       }
     };
+
+    if (myDiscord != null) 
+    {
       myDiscord.send("SET_ACTIVITY", args);
-    })
+    }
   }
 }