Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-15 02:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/11.3.1-dev' into 11.3-dev

Browse Source
This commit is contained in:
Schuyler Cebulskie
2018-01-18 14:32:36 -05:00
parent 2c8eb8a1ec c49c5576d0
commit bb8ed98a85
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -49,7 +49,7 @@
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^8.5.7", "@types/node": "^8.5.7",
"discord.js-docgen": "hydrabolt/discord.js-docgen", "discord.js-docgen": "discordjs/discord.js-docgen",
"eslint": "^4.15.0", "eslint": "^4.15.0",
"parallel-webpack": "^2.2.0", "parallel-webpack": "^2.2.0",
"uglifyjs-webpack-plugin": "^1.1.6", "uglifyjs-webpack-plugin": "^1.1.6",

2
src/client/rest/RESTMethods.js
View File

@@ -260,7 +260,7 @@ class RESTMethods {
if (allow instanceof Array) allow = Permissions.resolve(allow); if (allow instanceof Array) allow = Permissions.resolve(allow);
if (deny instanceof Array) deny = Permissions.resolve(deny); 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) { if (role) {
overwrite.id = role.id; overwrite.id = role.id;
overwrite.type = 'role'; overwrite.type = 'role';

2
src/structures/ClientUser.js
View File

@@ -271,7 +271,7 @@ class ClientUser extends User {
* @returns {Promise<Presence>} * @returns {Promise<Presence>}
*/ */
setActivity(name, { url, type } = {}) { setActivity(name, { url, type } = {}) {
if (!name) return this.setPresence({ activity: null }); if (!name) return this.setPresence({ game: null });
return this.setPresence({ return this.setPresence({
game: { name, type, url }, game: { name, type, url },
}); });