mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-17 03:53:29 +01:00
feat(GuildMember): add flags (#9087)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
@@ -28,6 +28,7 @@ exports.Colors = require('./util/Colors');
|
||||
exports.DataResolver = require('./util/DataResolver');
|
||||
exports.Events = require('./util/Events');
|
||||
exports.Formatters = require('./util/Formatters');
|
||||
exports.GuildMemberFlagsBitField = require('./util/GuildMemberFlagsBitField').GuildMemberFlagsBitField;
|
||||
exports.IntentsBitField = require('./util/IntentsBitField');
|
||||
exports.LimitedCollection = require('./util/LimitedCollection');
|
||||
exports.MessageFlagsBitField = require('./util/MessageFlagsBitField');
|
||||
|
||||
@@ -11,6 +11,7 @@ const BaseGuildVoiceChannel = require('../structures/BaseGuildVoiceChannel');
|
||||
const { GuildMember } = require('../structures/GuildMember');
|
||||
const { Role } = require('../structures/Role');
|
||||
const Events = require('../util/Events');
|
||||
const { GuildMemberFlagsBitField } = require('../util/GuildMemberFlagsBitField');
|
||||
const Partials = require('../util/Partials');
|
||||
|
||||
/**
|
||||
@@ -279,6 +280,7 @@ class GuildMemberManager extends CachedManager {
|
||||
* (if they are connected to voice), or `null` if you want to disconnect them from voice
|
||||
* @property {DateResolvable|null} [communicationDisabledUntil] The date or timestamp
|
||||
* for the member's communication to be disabled until. Provide `null` to enable communication again.
|
||||
* @property {GuildMemberFlagsResolvable} [flags] The flags to set for the member
|
||||
* @property {string} [reason] Reason for editing this user
|
||||
*/
|
||||
|
||||
@@ -314,6 +316,10 @@ class GuildMemberManager extends CachedManager {
|
||||
: options.communicationDisabledUntil;
|
||||
}
|
||||
|
||||
if (typeof options.flags !== 'undefined') {
|
||||
options.flags = GuildMemberFlagsBitField.resolve(options.flags);
|
||||
}
|
||||
|
||||
let endpoint;
|
||||
if (id === this.client.user.id) {
|
||||
const keys = Object.keys(options);
|
||||
|
||||
@@ -6,6 +6,7 @@ const VoiceState = require('./VoiceState');
|
||||
const TextBasedChannel = require('./interfaces/TextBasedChannel');
|
||||
const { DiscordjsError, ErrorCodes } = require('../errors');
|
||||
const GuildMemberRoleManager = require('../managers/GuildMemberRoleManager');
|
||||
const { GuildMemberFlagsBitField } = require('../util/GuildMemberFlagsBitField');
|
||||
const PermissionsBitField = require('../util/PermissionsBitField');
|
||||
|
||||
/**
|
||||
@@ -93,6 +94,16 @@ class GuildMember extends Base {
|
||||
this.communicationDisabledUntilTimestamp =
|
||||
data.communication_disabled_until && Date.parse(data.communication_disabled_until);
|
||||
}
|
||||
|
||||
if ('flags' in data) {
|
||||
/**
|
||||
* The flags of this member
|
||||
* @type {Readonly<GuildMemberFlagsBitField>}
|
||||
*/
|
||||
this.flags = new GuildMemberFlagsBitField(data.flags).freeze();
|
||||
} else {
|
||||
this.flags ??= new GuildMemberFlagsBitField().freeze();
|
||||
}
|
||||
}
|
||||
|
||||
_clone() {
|
||||
@@ -314,6 +325,16 @@ class GuildMember extends Base {
|
||||
return this.guild.members.edit(this, options);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the flags for this member.
|
||||
* @param {GuildMemberFlagsResolvable} flags The flags to set
|
||||
* @param {string} [reason] Reason for setting the flags
|
||||
* @returns {Promise<GuildMember>}
|
||||
*/
|
||||
setFlags(flags, reason) {
|
||||
return this.edit({ flags, reason });
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the nickname for this member.
|
||||
* @param {?string} nick The nickname for the guild member, or `null` if you want to reset their nickname
|
||||
@@ -423,6 +444,7 @@ class GuildMember extends Base {
|
||||
this.avatar === member.avatar &&
|
||||
this.pending === member.pending &&
|
||||
this.communicationDisabledUntilTimestamp === member.communicationDisabledUntilTimestamp &&
|
||||
this.flags.bitfield === member.flags.bitfield &&
|
||||
(this._roles === member._roles ||
|
||||
(this._roles.length === member._roles.length && this._roles.every((role, i) => role === member._roles[i])))
|
||||
);
|
||||
|
||||
@@ -273,6 +273,11 @@
|
||||
* @see {@link https://discord-api-types.dev/api/discord-api-types-v10/enum/GuildMFALevel}
|
||||
*/
|
||||
|
||||
/**
|
||||
* @external GuildMemberFlags
|
||||
* @see {@link https://discord-api-types.dev/api/discord-api-types-v10/enum/GuildMemberFlags}
|
||||
*/
|
||||
|
||||
/**
|
||||
* @external GuildNSFWLevel
|
||||
* @see {@link https://discord-api-types.dev/api/discord-api-types-v10/enum/GuildNSFWLevel}
|
||||
|
||||
41
packages/discord.js/src/util/GuildMemberFlagsBitField.js
Normal file
41
packages/discord.js/src/util/GuildMemberFlagsBitField.js
Normal file
@@ -0,0 +1,41 @@
|
||||
'use strict';
|
||||
|
||||
const { GuildMemberFlags } = require('discord-api-types/v10');
|
||||
const BitField = require('./BitField');
|
||||
|
||||
/**
|
||||
* Data structure that makes it easy to interact with a {@link GuildMember#flags} bitfield.
|
||||
* @extends {BitField}
|
||||
*/
|
||||
class GuildMemberFlagsBitField extends BitField {
|
||||
/**
|
||||
* Numeric guild guild member flags.
|
||||
* @type {GuildMemberFlags}
|
||||
* @memberof GuildMemberFlagsBitField
|
||||
*/
|
||||
static Flags = GuildMemberFlags;
|
||||
}
|
||||
|
||||
/**
|
||||
* @name GuildMemberFlagsBitField
|
||||
* @kind constructor
|
||||
* @memberof GuildMemberFlagsBitField
|
||||
* @param {BitFieldResolvable} [bits=0] Bit(s) to read from
|
||||
*/
|
||||
|
||||
/**
|
||||
* Bitfield of the packed bits
|
||||
* @type {number}
|
||||
* @name GuildMemberFlagsBitField#bitfield
|
||||
*/
|
||||
|
||||
/**
|
||||
* Data that can be resolved to give a guild member flag bitfield. This can be:
|
||||
* * A string (see {@link GuildMemberFlagsBitField.Flags})
|
||||
* * A guild member flag
|
||||
* * An instance of GuildMemberFlagsBitField
|
||||
* * An Array of GuildMemberFlagsResolvable
|
||||
* @typedef {string|number|GuildMemberFlagsBitField|GuildMemberFlagsResolvable[]} GuildMemberFlagsResolvable
|
||||
*/
|
||||
|
||||
exports.GuildMemberFlagsBitField = GuildMemberFlagsBitField;
|
||||
Reference in New Issue
Block a user