2.4.2

tweaks for game lobby invite stuff
CorySanin · Jul 14, 2019 · f9435fc · f9435fc
1 parent 721203c
commit f9435fc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "music-kitten",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Use your own soundtrack in Counter-Strike: Global Offensive",
   "main": "main.js",
   "scripts": {

diff --git a/richpresence.js b/richpresence.js
@@ -16,13 +16,11 @@ function setDiscordToggle(toggle){
 }
 
 function updateInfo(data, appyToExisting){
-  if(appyToExisting){
-    for(let key in data){
-      state[key] = data[key]
-    }
+  if(!appyToExisting){
+    state = {}
   }
-  else{
-    state = data
+  for(let key in data){
+    state[key] = data[key]
   }
 }
 
@@ -38,7 +36,7 @@ function setActivity(){
 
 rpc.on('ready', () => {
   rpc.subscribe('GAME_JOIN', function(payload){
-    shell.openExternal(payload.secret)
+    shell.openExternal('steam://joinlobby/730/' + payload.secret)
   })
 
   setActivity()

diff --git a/server.js b/server.js
@@ -304,14 +304,19 @@ function getAuth(){
 }
 
 ipc.on('inviteUrl', function(event, partyId){
-  richpresence(MENURPC, false)
-  if(partyId.includes('joinlobby')){
-    richpresence({
-      partyId: btoa(partyId),
-      partySize: 1,
-      partyMax: 5,
-      joinSecret: partyId
-    }, true)
+  let includesLobbyId = partyId.includes('joinlobby')
+  richpresence(MENURPC, includesLobbyId)
+  if(includesLobbyId){
+    let split = partyId.split('/')
+    if(split.length >= 6){
+      let lobbyId = split[4]
+      richpresence({
+        partyId: btoa(lobbyId),
+        partySize: 1,
+        partyMax: 5,
+        joinSecret: [lobbyId, split[5]].join('/')
+      }, true)
+    }
   }
 })