mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-11 17:13:31 +01:00
refactor: comprehensive permissionOverwrites refactor (#2818)
* wip: comprehensive permissionOverwrites refactor * PermissionOverwrites.resolve should Promise.reject() where a promise is the expected return value * On second thought, async rewrite to automatically reject on throw * Fix some docs * Fix a bug * fix 2 more bugs * typings: Updated for latest commit * typings: Add missing method in GuildChannel * typings: Add missing `| null` in PermissionOverwriteOption type * Suggested changes
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
const Role = require('./Role');
|
||||
const Permissions = require('../util/Permissions');
|
||||
const Util = require('../util/Util');
|
||||
const { TypeError } = require('../errors');
|
||||
|
||||
/**
|
||||
* Represents a permission overwrite for a role or member in a guild channel.
|
||||
@@ -50,6 +52,27 @@ class PermissionOverwrites {
|
||||
this.allow = new Permissions(data.allow).freeze();
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates this prermissionOverwrites.
|
||||
* @param {PermissionOverwriteOption} options The options for the update
|
||||
* @param {string} [reason] Reason for creating/editing this overwrite
|
||||
* @returns {Promise<PermissionOverwrites>}
|
||||
* @example
|
||||
* // Update permission overwrites
|
||||
* permissionOverwrites.update({
|
||||
* SEND_MESSAGES: false
|
||||
* })
|
||||
* .then(channel => console.log(channel.permissionOverwrites.get(message.author.id)))
|
||||
* .catch(console.error);
|
||||
*/
|
||||
update(options, reason) {
|
||||
const { allow, deny } = this.constructor.resolveOverwriteOptions(options, this);
|
||||
|
||||
return this.channel.client.api.channels(this.channel.id).permissions[this.id]
|
||||
.put({ data: { id: this.id, type: this.type, allow: allow.bitfield, deny: deny.bitfield }, reason })
|
||||
.then(() => this);
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes this Permission Overwrite.
|
||||
* @param {string} [reason] Reason for deleting this overwrite
|
||||
@@ -64,6 +87,102 @@ class PermissionOverwrites {
|
||||
toJSON() {
|
||||
return Util.flatten(this);
|
||||
}
|
||||
|
||||
/**
|
||||
* An object mapping permission flags to `true` (enabled), `null` (unset) or `false` (disabled).
|
||||
* ```js
|
||||
* {
|
||||
* 'SEND_MESSAGES': true,
|
||||
* 'EMBED_LINKS': null,
|
||||
* 'ATTACH_FILES': false,
|
||||
* }
|
||||
* ```
|
||||
* @typedef {Object} PermissionOverwriteOption
|
||||
*/
|
||||
|
||||
/**
|
||||
* @typedef {object} ResolvedOverwriteOptions
|
||||
* @property {Permissions} allow The allowed permissions
|
||||
* @property {Permissions} deny The denied permissions
|
||||
*/
|
||||
|
||||
/**
|
||||
* Deletes this Permission Overwrite.
|
||||
* @param {PermissionOverwriteOption} options The options for the update
|
||||
* @param {Object} initialPermissions The initial permissions
|
||||
* @param {PermissionResolvable} initialPermissions.allow Initial allowed permissions
|
||||
* @param {PermissionResolvable} initialPermissions.deny Initial denied permissions
|
||||
* @returns {ResolvedOverwriteOptions}
|
||||
*/
|
||||
static resolveOverwriteOptions(options, { allow, deny } = {}) {
|
||||
allow = new Permissions(allow);
|
||||
deny = new Permissions(deny);
|
||||
|
||||
for (const [perm, value] of Object.entries(options)) {
|
||||
if (value === true) {
|
||||
allow.add(Permissions.FLAGS[perm]);
|
||||
deny.remove(Permissions.FLAGS[perm]);
|
||||
} else if (value === false) {
|
||||
allow.remove(Permissions.FLAGS[perm]);
|
||||
deny.add(Permissions.FLAGS[perm]);
|
||||
} else if (value === null) {
|
||||
allow.remove(Permissions.FLAGS[perm]);
|
||||
deny.remove(Permissions.FLAGS[perm]);
|
||||
}
|
||||
}
|
||||
|
||||
return { allow, deny };
|
||||
}
|
||||
|
||||
/**
|
||||
* The raw data for a permission overwrite
|
||||
* @typedef {Object} RawOverwriteData
|
||||
* @property {Snowflake} id The id of the overwrite
|
||||
* @property {number} allow The permissions to allow
|
||||
* @property {number} deny The permissions to deny
|
||||
* @property {OverwriteType} type The type of this OverwriteData
|
||||
*/
|
||||
|
||||
/**
|
||||
* Data that can be resolved into {@link RawOverwriteData}
|
||||
* @typedef {PermissionOverwrites|OverwriteData} OverwriteResolvable
|
||||
*/
|
||||
|
||||
/**
|
||||
* Data that can be used for a permission overwrite
|
||||
* @typedef {Object} OverwriteData
|
||||
* @property {GuildMemberResolvable|RoleResolvable} id Member or role this overwrite is for
|
||||
* @property {PermissionResolvable} [allow] The permissions to allow
|
||||
* @property {PermissionResolvable} [deny] The permissions to deny
|
||||
* @property {OverwriteType} [type] The type of this OverwriteData
|
||||
*/
|
||||
|
||||
/**
|
||||
* Resolves an overwrite into {@link RawOverwriteData}.
|
||||
* @param {OverwriteResolvable} overwrite The overwrite-like data to resolve
|
||||
* @param {Guild} guild The guild to resolve from
|
||||
* @returns {RawOverwriteData}
|
||||
*/
|
||||
static resolve(overwrite, guild) {
|
||||
if (overwrite instanceof this) return overwrite.toJSON();
|
||||
if (typeof overwrite.id === 'string' && ['role', 'member'].includes(overwrite.type)) {
|
||||
return { ...overwrite,
|
||||
allow: Permissions.resolve(overwrite.allow),
|
||||
deny: Permissions.resolve(overwrite.deny),
|
||||
};
|
||||
}
|
||||
|
||||
const userOrRole = guild.roles.resolve(overwrite.id) || guild.client.users.resolve(overwrite.id);
|
||||
if (!userOrRole) throw new TypeError('INVALID_TYPE', 'parameter', 'User nor a Role', true);
|
||||
const type = userOrRole instanceof Role ? 'role' : 'member';
|
||||
|
||||
return {
|
||||
id: userOrRole.id,
|
||||
type,
|
||||
allow: Permissions.resolve(overwrite.allow),
|
||||
deny: Permissions.resolve(overwrite.deny),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = PermissionOverwrites;
|
||||
|
||||
Reference in New Issue
Block a user