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

Make GuildMember.kickable/bannable take role IDs into account

Browse Source
This commit is contained in:
Schuyler Cebulskie
2016-10-01 02:54:25 -04:00
parent db815d4d9f
commit d1e07674b8
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/structures/GuildMember.js
View File

@@ -204,7 +204,10 @@ class GuildMember {
if (this.user.id === this.client.user.id) return false; if (this.user.id === this.client.user.id) return false;
const clientMember = this.guild.member(this.client.user); const clientMember = this.guild.member(this.client.user);
if (!clientMember.hasPermission(Constants.PermissionFlags.KICK_MEMBERS)) return false; if (!clientMember.hasPermission(Constants.PermissionFlags.KICK_MEMBERS)) return false;
return clientMember.highestRole.position > this.highestRole.position; const clientRole = clientMember.highestRole;
const thisRole = this.highestRole;
return clientRole.position > thisRole.position ||
(clientRole.position === thisRole.position && clientRole.id < thisRole.position);
} }
/** /**
@@ -217,7 +220,10 @@ class GuildMember {
if (this.user.id === this.client.user.id) return false; if (this.user.id === this.client.user.id) return false;
const clientMember = this.guild.member(this.client.user); const clientMember = this.guild.member(this.client.user);
if (!clientMember.hasPermission(Constants.PermissionFlags.BAN_MEMBERS)) return false; if (!clientMember.hasPermission(Constants.PermissionFlags.BAN_MEMBERS)) return false;
return clientMember.highestRole.position > this.highestRole.position; const clientRole = clientMember.highestRole;
const thisRole = this.highestRole;
return clientRole.position > thisRole.position ||
(clientRole.position === thisRole.position && clientRole.id < thisRole.position);
} }
/** /**