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

Add role position comparison methods

Browse Source
This commit is contained in:
Schuyler Cebulskie
2016-10-01 03:32:08 -04:00
parent 93cf34a814
commit 66beeb9535
3 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/structures/GuildMember.js
View File

@@ -135,9 +135,7 @@ class GuildMember {
* @readonly
*/
get highestRole() {
return this.roles.reduce((prev, role) =>
!prev || role.position > prev.position || (role.position === prev.position && role.id < prev.id) ? role : prev
);
return this.roles.reduce((prev, role) => !prev || role.comparePositionTo(prev) > 0 ? role : prev);
}
/**
@@ -204,10 +202,7 @@ class GuildMember {
if (this.user.id === this.client.user.id) return false;
const clientMember = this.guild.member(this.client.user);
if (!clientMember.hasPermission(Constants.PermissionFlags.KICK_MEMBERS)) return false;
const clientRole = clientMember.highestRole;
const thisRole = this.highestRole;
return clientRole.position > thisRole.position ||
(clientRole.position === thisRole.position && clientRole.id < thisRole.id);
return clientMember.highestRole.comparePositionTo(this.highestRole) > 0;
}
/**
@@ -220,10 +215,7 @@ class GuildMember {
if (this.user.id === this.client.user.id) return false;
const clientMember = this.guild.member(this.client.user);
if (!clientMember.hasPermission(Constants.PermissionFlags.BAN_MEMBERS)) return false;
const clientRole = clientMember.highestRole;
const thisRole = this.highestRole;
return clientRole.position > thisRole.position ||
(clientRole.position === thisRole.position && clientRole.id < thisRole.id);
return clientMember.highestRole.comparePositionTo(this.highestRole) > 0;
}
/**