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

refactor(GuildMember#manageable): refactored kickable and bannable (#2211)

Browse Source 
* refactor(GuildMember#manageable): merged kickable and bannable code

* hydar suggestion
This commit is contained in:
Isabella
2018-01-15 18:32:40 -06:00
committed by Crawl
parent 4122db0275
commit 36555c1cea
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/structures/GuildMember.js
View File

@@ -259,17 +259,24 @@ class GuildMember extends Base {
return new Permissions(this.roles.map(role => role.permissions)).freeze(); return new Permissions(this.roles.map(role => role.permissions)).freeze();
} }
/**
* Whether the member is manageable in terms of role hierarchy by the client user
* @type {boolean}
* @readonly
*/
get manageable() {
if (this.user.id === this.guild.ownerID) return false;
if (this.user.id === this.client.user.id) return false;
return this.guild.me.highestRole.comparePositionTo(this.highestRole) > 0;
}
/** /**
* Whether the member is kickable by the client user * Whether the member is kickable by the client user
* @type {boolean} * @type {boolean}
* @readonly * @readonly
*/ */
get kickable() { get kickable() {
if (this.user.id === this.guild.ownerID) return false; return this.manageable && this.guild.me.permissions.has(Permissions.FLAGS.KICK_MEMBERS);
if (this.user.id === this.client.user.id) return false;
const clientMember = this.guild.member(this.client.user);
if (!clientMember.permissions.has(Permissions.FLAGS.KICK_MEMBERS)) return false;
return clientMember.highestRole.comparePositionTo(this.highestRole) > 0;
} }
/** /**
@@ -278,11 +285,7 @@ class GuildMember extends Base {
* @readonly * @readonly
*/ */
get bannable() { get bannable() {
if (this.user.id === this.guild.ownerID) return false; return this.manageable && this.guild.me.permissions.has(Permissions.FLAGS.BAN_MEMBERS);
if (this.user.id === this.client.user.id) return false;
const clientMember = this.guild.member(this.client.user);
if (!clientMember.permissions.has(Permissions.FLAGS.BAN_MEMBERS)) return false;
return clientMember.highestRole.comparePositionTo(this.highestRole) > 0;
} }
/** /**