dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-06-19 14:41:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Webpack build for branch master: cda408534a

Browse source
This commit is contained in:
Travis CI 2017-10-28 17:02:05 +00:00
parent 2e617b09ba
commit d22b451f51
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
discord.master.js
View file

@ -2621,19 +2621,13 @@ class GuildMember extends Base {
/**
* Checks if any of the member's roles have a permission.
* @param {PermissionResolvable|PermissionResolvable[]} permission Permission(s) to check for
* @param {boolean} [explicit=false] Whether to require the role to explicitly have the exact permission
* **(deprecated)**
* @param {boolean} [checkAdmin] Whether to allow the administrator permission to override
* (takes priority over `explicit`)
* @param {boolean} [checkOwner] Whether to allow being the guild's owner to override
* (takes priority over `explicit`)
* @param {boolean} [checkAdmin=true] Whether to allow the administrator permission to override
* @param {boolean} [checkOwner=true] Whether to allow being the guild's owner to override
* @returns {boolean}
*/
hasPermission(permission, explicit = false, checkAdmin, checkOwner) {
if (typeof checkAdmin === 'undefined') checkAdmin = !explicit;
if (typeof checkOwner === 'undefined') checkOwner = !explicit;
hasPermission(permission, checkAdmin = true, checkOwner = true) {
if (checkOwner && this.user.id === this.guild.ownerID) return true;
return this.roles.some(r => r.permissions.has(permission, undefined, checkAdmin));
return this.roles.some(r => r.permissions.has(permission, checkAdmin));
}
/**
@ -5224,8 +5218,6 @@ class User extends Base {
* @type {?Message}
*/
this.lastMessage = null;
if (data.token) this.client.token = data.token;
}
/**
@ -10317,6 +10309,8 @@ class ClientUser extends User {
this.guildSettings.set(settings.guild_id, new ClientUserGuildSettings(this.client, settings));
}
}
if (data.token) this.client.token = data.token;
}
/**

2
discord.master.min.js vendored
View file

File diff suppressed because one or more lines are too long