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

Fix permission overwrites for @everyone

Browse Source
This commit is contained in:
Schuyler Cebulskie
2016-09-07 23:42:14 -04:00
parent 465ff074e1
commit 978cf9d87f
1 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/structures/GuildChannel.js
View File

@@ -56,14 +56,15 @@ class GuildChannel extends Channel {
*/ */
permissionsFor(member) { permissionsFor(member) {
member = this.client.resolver.resolveGuildMember(this.guild, member); member = this.client.resolver.resolveGuildMember(this.guild, member);
if (member) { if (!member) return null;
if (this.guild.owner.id === member.id) return new EvaluatedPermissions(member, Constants.ALL_PERMISSIONS); if (this.guild.owner.id === member.id) return new EvaluatedPermissions(member, Constants.ALL_PERMISSIONS);
const roles = member.roles;
let permissions = 0; let permissions = 0;
const overwrites = this.overwritesFor(member, true);
const roles = member.roles;
for (const role of roles.values()) permissions |= role.permissions; for (const role of roles.values()) permissions |= role.permissions;
const overwrites = this.overwritesFor(member, true, roles);
for (const overwrite of overwrites.role.concat(overwrites.member)) { for (const overwrite of overwrites.role.concat(overwrites.member)) {
permissions &= ~overwrite.denyData; permissions &= ~overwrite.denyData;
permissions |= overwrite.allowData; permissions |= overwrite.allowData;
@@ -75,22 +76,18 @@ class GuildChannel extends Channel {
return new EvaluatedPermissions(member, permissions); return new EvaluatedPermissions(member, permissions);
} }
return null; overwritesFor(member, verified = false, roles = null) {
}
overwritesFor(member, verified) {
// for speed
if (!verified) member = this.client.resolver.resolveGuildMember(this.guild, member); if (!verified) member = this.client.resolver.resolveGuildMember(this.guild, member);
if (member) { if (!member) return [];
const memberRoles = member._roles;
roles = roles || member.roles;
const roleOverwrites = []; const roleOverwrites = [];
const memberOverwrites = []; const memberOverwrites = [];
for (const overwrite of this.permissionOverwrites.values()) { for (const overwrite of this.permissionOverwrites.values()) {
if (overwrite.id === member.id) { if (overwrite.id === member.id) {
memberOverwrites.push(overwrite); memberOverwrites.push(overwrite);
} else if (memberRoles.indexOf(overwrite.id) > -1) { } else if (roles.has(overwrite.id)) {
roleOverwrites.push(overwrite); roleOverwrites.push(overwrite);
} }
} }
@@ -101,9 +98,6 @@ class GuildChannel extends Channel {
}; };
} }
return [];
}
/** /**
* An object mapping permission flags to `true` (enabled) or `false` (disabled) * An object mapping permission flags to `true` (enabled) or `false` (disabled)
* ```js * ```js