Jonttu/HeliosLauncher
1
0
Fork 1
mirror of https://github.com/dscalzi/HeliosLauncher.git synced 2024-12-22 11:42:14 -08:00
Code Issues Projects Releases Wiki Activity

Updated discord-rpc, changed ad hoc fix to api fix.

Browse Source
This commit is contained in:
Daniel Scalzi 2018-06-03 15:35:39 -04:00
parent 74a60a61c2
commit 97e9c15baf
No known key found for this signature in database
GPG Key ID: 5CA2F145B63535F9
3 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/js/discordwrapper.js
View File

@ -42,8 +42,7 @@ exports.updateDetails = function(details){
exports.shutdownRPC = function(){ exports.shutdownRPC = function(){
if(!rpc) return if(!rpc) return
// Workaround until discord rpc releases clearActivity() rpc.clearActivity()
rpc.request('SET_ACTIVITY', {pid: process.pid})
rpc.destroy() rpc.destroy()
rpc = null rpc = null
activity = null activity = null

42
package-lock.json generated
View File

@ -671,16 +671,16 @@
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
}, },
"discord-rpc": { "discord-rpc": {
"version": "3.0.0-beta.10", "version": "3.0.0-beta.11",
"resolved": "https://registry.npmjs.org/discord-rpc/-/discord-rpc-3.0.0-beta.10.tgz", "resolved": "https://registry.npmjs.org/discord-rpc/-/discord-rpc-3.0.0-beta.11.tgz",
"integrity": "sha512-b0G6O0WJkxoLQSopyNRqByXCrpBL68HXPMULVZXLjRgj+sStwOmbABM+HwBDJWF6s/uhkB/+cAgq+19x4w0SPA==", "integrity": "sha512-0KtAOjvK9g7sRzTvPvWm6LZTBqfRAfXhFib930YDxbVqX2CGYAWfaKuRiwtPFQVV5fJPIfRfbrwlElmmqC/L9w==",
"requires": { "requires": {
"discord.js": "github:discordjs/discord.js#a5e8f05d01e34b69b80736688704ee594b4d0900", "discord.js": "github:discordjs/discord.js#faf27fabc055cb3850e823cf36c0af21c0139c35",
"snekfetch": "^3.5.8" "snekfetch": "^3.5.8"
}
}, },
"dependencies": {
"discord.js": { "discord.js": {
"version": "github:discordjs/discord.js#a5e8f05d01e34b69b80736688704ee594b4d0900", "version": "github:discordjs/discord.js#faf27fabc055cb3850e823cf36c0af21c0139c35",
"from": "github:discordjs/discord.js", "from": "github:discordjs/discord.js",
"requires": { "requires": {
"pako": "^1.0.0", "pako": "^1.0.0",
@ -688,26 +688,12 @@
"snekfetch": "^3.6.0", "snekfetch": "^3.6.0",
"tweetnacl": "^1.0.0", "tweetnacl": "^1.0.0",
"ws": "^4.0.0" "ws": "^4.0.0"
}
},
"prism-media": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/prism-media/-/prism-media-0.2.1.tgz",
"integrity": "sha512-Kfp1+6gzjY6X8mqKHa6D3brX+BtMUPFwzAkz4zgtVPgbkA2XxhITROdfQXVurU4fuJsylFRwqo7ciQlQCm9hAw=="
}, },
"dependencies": {
"tweetnacl": { "tweetnacl": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.0.tgz", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.0.tgz",
"integrity": "sha1-cT2LgY2kIGh0C/aDhtBHnmb8ins=" "integrity": "sha1-cT2LgY2kIGh0C/aDhtBHnmb8ins="
},
"ws": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz",
"integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
"requires": {
"async-limiter": "~1.0.0",
"safe-buffer": "~5.1.0"
}
} }
} }
}, },
@ -2181,6 +2167,11 @@
"meow": "^3.1.0" "meow": "^3.1.0"
} }
}, },
"prism-media": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/prism-media/-/prism-media-0.2.1.tgz",
"integrity": "sha512-Kfp1+6gzjY6X8mqKHa6D3brX+BtMUPFwzAkz4zgtVPgbkA2XxhITROdfQXVurU4fuJsylFRwqo7ciQlQCm9hAw=="
},
"process-nextick-args": { "process-nextick-args": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
@ -2968,6 +2959,15 @@
"signal-exit": "^3.0.2" "signal-exit": "^3.0.2"
} }
}, },
"ws": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz",
"integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
"requires": {
"async-limiter": "~1.0.0",
"safe-buffer": "~5.1.0"
}
},
"xdg-basedir": { "xdg-basedir": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",

2
package.json
View File

@ -30,7 +30,7 @@
"dependencies": { "dependencies": {
"adm-zip": "^0.4.11", "adm-zip": "^0.4.11",
"async": "^2.6.1", "async": "^2.6.1",
"discord-rpc": "^3.0.0-beta.10", "discord-rpc": "^3.0.0-beta.11",
"ejs": "^2.6.1", "ejs": "^2.6.1",
"ejs-electron": "^2.0.3", "ejs-electron": "^2.0.3",
"electron-is-dev": "^0.3.0", "electron-is-dev": "^0.3.0",