diff --git a/app/assets/js/discordwrapper.js b/app/assets/js/discordwrapper.js index 01ff06f9..433e1e7a 100644 --- a/app/assets/js/discordwrapper.js +++ b/app/assets/js/discordwrapper.js @@ -42,8 +42,7 @@ exports.updateDetails = function(details){ exports.shutdownRPC = function(){ if(!rpc) return - // Workaround until discord rpc releases clearActivity() - rpc.request('SET_ACTIVITY', {pid: process.pid}) + rpc.clearActivity() rpc.destroy() rpc = null activity = null diff --git a/package-lock.json b/package-lock.json index 3ebc0e6f..b2677f88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -671,43 +671,29 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, "discord-rpc": { - "version": "3.0.0-beta.10", - "resolved": "https://registry.npmjs.org/discord-rpc/-/discord-rpc-3.0.0-beta.10.tgz", - "integrity": "sha512-b0G6O0WJkxoLQSopyNRqByXCrpBL68HXPMULVZXLjRgj+sStwOmbABM+HwBDJWF6s/uhkB/+cAgq+19x4w0SPA==", + "version": "3.0.0-beta.11", + "resolved": "https://registry.npmjs.org/discord-rpc/-/discord-rpc-3.0.0-beta.11.tgz", + "integrity": "sha512-0KtAOjvK9g7sRzTvPvWm6LZTBqfRAfXhFib930YDxbVqX2CGYAWfaKuRiwtPFQVV5fJPIfRfbrwlElmmqC/L9w==", "requires": { - "discord.js": "github:discordjs/discord.js#a5e8f05d01e34b69b80736688704ee594b4d0900", + "discord.js": "github:discordjs/discord.js#faf27fabc055cb3850e823cf36c0af21c0139c35", "snekfetch": "^3.5.8" + } + }, + "discord.js": { + "version": "github:discordjs/discord.js#faf27fabc055cb3850e823cf36c0af21c0139c35", + "from": "github:discordjs/discord.js", + "requires": { + "pako": "^1.0.0", + "prism-media": "^0.2.0", + "snekfetch": "^3.6.0", + "tweetnacl": "^1.0.0", + "ws": "^4.0.0" }, "dependencies": { - "discord.js": { - "version": "github:discordjs/discord.js#a5e8f05d01e34b69b80736688704ee594b4d0900", - "from": "github:discordjs/discord.js", - "requires": { - "pako": "^1.0.0", - "prism-media": "^0.2.0", - "snekfetch": "^3.6.0", - "tweetnacl": "^1.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==" - }, "tweetnacl": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.0.tgz", "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" } }, + "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": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", @@ -2968,6 +2959,15 @@ "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": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", diff --git a/package.json b/package.json index 638869db..9a06a2f9 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "dependencies": { "adm-zip": "^0.4.11", "async": "^2.6.1", - "discord-rpc": "^3.0.0-beta.10", + "discord-rpc": "^3.0.0-beta.11", "ejs": "^2.6.1", "ejs-electron": "^2.0.3", "electron-is-dev": "^0.3.0",