daenamnu/discordeno
1
0
Fork 0
mirror of https://github.com/discordeno/discordeno.git synced 2026-06-16 19:28:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use correct bitwise operator (#302)

Browse Source 
* Fix permissions (sorry my ide changed & to &&)

* Change botHasChannelPermissions to async.
This seems to have fixed my issue for my bot

* Remove async for botHasChannelPermissions

* Add async back for botHasChannelPermissions since it doesn't work without it

* Remove async, the issues were something else apparently
This commit is contained in:
TriForMine
2020-12-30 14:35:39 +01:00
committed by GitHub
parent 484f86638f
commit d53725d069
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/handlers/channel.ts
+2 -2
View File
@@ -38,8 +38,8 @@ export function channelOverwriteHasPermission(
if (overwrite) { if (overwrite) {
const allowBits = overwrite.allow; const allowBits = overwrite.allow;
const denyBits = overwrite.deny; const denyBits = overwrite.deny;
if (BigInt(denyBits) && BigInt(Permissions[perm])) return false; if (BigInt(denyBits) & BigInt(Permissions[perm])) return false;
if (BigInt(allowBits) && BigInt(Permissions[perm])) return true; if (BigInt(allowBits) & BigInt(Permissions[perm])) return true;
} }
return false; return false;
}); });
src/util/permissions.ts
+12 -12
View File
@@ -41,10 +41,10 @@ export function memberHasPermission(
return bits; return bits;
}, BigInt(0)); }, BigInt(0));
if (permissionBits && BigInt(Permissions.ADMINISTRATOR)) return true; if (permissionBits & BigInt(Permissions.ADMINISTRATOR)) return true;
return permissions.every((permission) => return permissions.every((permission) =>
permissionBits && BigInt(Permissions[permission]) permissionBits & BigInt(Permissions[permission])
); );
} }
@@ -74,10 +74,10 @@ export async function botHasPermission(
return bits; return bits;
}, BigInt(0)); }, BigInt(0));
if (permissionBits && BigInt(Permissions.ADMINISTRATOR)) return true; if (permissionBits & BigInt(Permissions.ADMINISTRATOR)) return true;
return permissions.every((permission) => return permissions.every((permission) =>
permissionBits && BigInt(Permissions[permission]) permissionBits & BigInt(Permissions[permission])
); );
} }
@@ -134,12 +134,12 @@ export async function hasChannelPermissions(
const denyBits = memberOverwrite.deny; const denyBits = memberOverwrite.deny;
for (const perm of permissions) { for (const perm of permissions) {
// One of the necessary permissions is denied. Since this is main permission we can cancel if its denied. // One of the necessary permissions is denied. Since this is main permission we can cancel if its denied.
if (BigInt(denyBits) && BigInt(Permissions[perm])) return false; if (BigInt(denyBits) & BigInt(Permissions[perm])) return false;
// Already allowed perm // Already allowed perm
if (allowedPermissions.has(perm)) continue; if (allowedPermissions.has(perm)) continue;
// This perm is allowed so we save it // This perm is allowed so we save it
if (BigInt(allowBits) && BigInt(Permissions[perm])) { if (BigInt(allowBits) & BigInt(Permissions[perm])) {
allowedPermissions.add(perm); allowedPermissions.add(perm);
} }
} }
@@ -153,17 +153,17 @@ export async function hasChannelPermissions(
for (const overwrite of rolesOverwrites) { for (const overwrite of rolesOverwrites) {
const allowBits = overwrite.allow; const allowBits = overwrite.allow;
// This perm is allowed so we save it // This perm is allowed so we save it
if (BigInt(allowBits) && BigInt(Permissions[perm])) { if (BigInt(allowBits) & BigInt(Permissions[perm])) {
allowedPermissions.add(perm); allowedPermissions.add(perm);
break; break;
} }
const denyBits = overwrite.deny; const denyBits = overwrite.deny;
// If this role denies it we need to save and check if another role allows it, allows > deny // If this role denies it we need to save and check if another role allows it, allows > deny
if (BigInt(denyBits) && BigInt(Permissions[perm])) { if (BigInt(denyBits) & BigInt(Permissions[perm])) {
// This role denies his perm, but before denying we need to check all other roles if any allow as allow > deny // This role denies his perm, but before denying we need to check all other roles if any allow as allow > deny
const isAllowed = rolesOverwrites.some((o) => const isAllowed = rolesOverwrites.some((o) =>
BigInt(o.allow) && BigInt(Permissions[perm]) BigInt(o.allow) & BigInt(Permissions[perm])
); );
if (isAllowed) continue; if (isAllowed) continue;
// This permission is in fact denied. Since Roles overrule everything below here we can cancel ou here // This permission is in fact denied. Since Roles overrule everything below here we can cancel ou here
@@ -179,9 +179,9 @@ export async function hasChannelPermissions(
// Already allowed perm // Already allowed perm
if (allowedPermissions.has(perm)) continue; if (allowedPermissions.has(perm)) continue;
// One of the necessary permissions is denied. Since everyone overwrite overrides role perms we can cancel here // One of the necessary permissions is denied. Since everyone overwrite overrides role perms we can cancel here
if (BigInt(denyBits) && BigInt(Permissions[perm])) return false; if (BigInt(denyBits) & BigInt(Permissions[perm])) return false;
// This perm is allowed so we save it // This perm is allowed so we save it
if (BigInt(allowBits) && BigInt(Permissions[perm])) { if (BigInt(allowBits) & BigInt(Permissions[perm])) {
allowedPermissions.add(perm); allowedPermissions.add(perm);
} }
} }
@@ -198,7 +198,7 @@ export async function hasChannelPermissions(
export function calculatePermissions(permissionBits: bigint) { export function calculatePermissions(permissionBits: bigint) {
return Object.keys(Permissions).filter((perm) => { return Object.keys(Permissions).filter((perm) => {
if (Number(perm)) return false; if (Number(perm)) return false;
return permissionBits && BigInt(Permissions[perm as Permission]); return permissionBits & BigInt(Permissions[perm as Permission]);
}) as Permission[]; }) as Permission[];
} }