From 932980e91f1610ae29e1a5d2b10d6b4cd7253f7f Mon Sep 17 00:00:00 2001 From: Isabella Date: Tue, 16 Jan 2018 08:28:08 -0600 Subject: [PATCH 1/3] fix(guild#createRole): incorrect guild reference --- src/client/rest/RESTMethods.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/rest/RESTMethods.js b/src/client/rest/RESTMethods.js index e0ff6bec0..3b13d1d96 100644 --- a/src/client/rest/RESTMethods.js +++ b/src/client/rest/RESTMethods.js @@ -260,7 +260,7 @@ class RESTMethods { if (allow instanceof Array) allow = Permissions.resolve(allow); if (deny instanceof Array) deny = Permissions.resolve(deny); - const role = this.client.resolver.resolveRole(this, overwrite.id); + const role = this.client.resolver.resolveRole(guild, overwrite.id); if (role) { overwrite.id = role.id; overwrite.type = 'role'; From 8cbefcc081ea3f386437ee0ddefcc6aaac766e7a Mon Sep 17 00:00:00 2001 From: MaySoMusician <34566290+MaySoMusician@users.noreply.github.com> Date: Thu, 18 Jan 2018 17:39:54 +0900 Subject: [PATCH 2/3] [v11.3.x] Fix param to setPresence in setActivity (#2270) ClientUser#setPresence in master branch (latest) calls client.presences.setClientPresence, but that in v11.3 does not so i change parameter sent to setPresence for clearing the game activity, from activity:null to game:null, for now until setPresence gets updated --- src/structures/ClientUser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/structures/ClientUser.js b/src/structures/ClientUser.js index 75b26a7ee..31564ae20 100644 --- a/src/structures/ClientUser.js +++ b/src/structures/ClientUser.js @@ -271,7 +271,7 @@ class ClientUser extends User { * @returns {Promise} */ setActivity(name, { url, type } = {}) { - if (!name) return this.setPresence({ activity: null }); + if (!name) return this.setPresence({ game: null }); return this.setPresence({ game: { name, type, url }, }); From c49c5576d01a656ce915cfaf4b68cebba11c192d Mon Sep 17 00:00:00 2001 From: Amish Shah Date: Thu, 18 Jan 2018 17:54:45 +0000 Subject: [PATCH 3/3] Point discord.js-docgen dependency to its new location --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3d83e1897..d6c510ed4 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ }, "devDependencies": { "@types/node": "^8.5.7", - "discord.js-docgen": "hydrabolt/discord.js-docgen", + "discord.js-docgen": "discordjs/discord.js-docgen", "eslint": "^4.15.0", "parallel-webpack": "^2.2.0", "uglifyjs-webpack-plugin": "^1.1.6",