feat(GuildMember): v13 add flags

This commit is contained in:
Elysia 2023-02-19 12:07:03 +07:00
parent 92f21d9b9c
commit fae7c596d1
5 changed files with 86 additions and 0 deletions

View File

@ -18,6 +18,7 @@ exports.Constants = require('./util/Constants');
exports.DataResolver = require('./util/DataResolver'); exports.DataResolver = require('./util/DataResolver');
exports.DiscordAPIError = require('./rest/DiscordAPIError'); exports.DiscordAPIError = require('./rest/DiscordAPIError');
exports.Formatters = require('./util/Formatters'); exports.Formatters = require('./util/Formatters');
exports.GuildMemberFlags = require('./util/GuildMemberFlags');
exports.HTTPError = require('./rest/HTTPError'); exports.HTTPError = require('./rest/HTTPError');
exports.Intents = require('./util/Intents'); exports.Intents = require('./util/Intents');
exports.LimitedCollection = require('./util/LimitedCollection'); exports.LimitedCollection = require('./util/LimitedCollection');

View File

@ -11,6 +11,7 @@ const { Role } = require('../structures/Role');
const { Events, Opcodes } = require('../util/Constants'); const { Events, Opcodes } = require('../util/Constants');
const { PartialTypes } = require('../util/Constants'); const { PartialTypes } = require('../util/Constants');
const DataResolver = require('../util/DataResolver'); const DataResolver = require('../util/DataResolver');
const GuildMemberFlags = require('../util/GuildMemberFlags');
const SnowflakeUtil = require('../util/SnowflakeUtil'); const SnowflakeUtil = require('../util/SnowflakeUtil');
/** /**
@ -276,6 +277,7 @@ class GuildMemberManager extends CachedManager {
* (if they are connected to voice), or `null` if you want to disconnect them from voice * (if they are connected to voice), or `null` if you want to disconnect them from voice
* @property {DateResolvable|null} [communicationDisabledUntil] The date or timestamp * @property {DateResolvable|null} [communicationDisabledUntil] The date or timestamp
* for the member's communication to be disabled until. Provide `null` to enable communication again. * 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 {?(BufferResolvable|Base64Resolvable)} [avatar] The new guild avatar * @property {?(BufferResolvable|Base64Resolvable)} [avatar] The new guild avatar
* @property {?(BufferResolvable|Base64Resolvable)} [banner] The new guild banner * @property {?(BufferResolvable|Base64Resolvable)} [banner] The new guild banner
* @property {?string} [bio] The new guild about me * @property {?string} [bio] The new guild about me
@ -311,6 +313,8 @@ class GuildMemberManager extends CachedManager {
_data.communication_disabled_until = _data.communication_disabled_until =
_data.communicationDisabledUntil && new Date(_data.communicationDisabledUntil).toISOString(); _data.communicationDisabledUntil && new Date(_data.communicationDisabledUntil).toISOString();
_data.flags = _data.flags && GuildMemberFlags.resolve(_data.flags);
// Avatar, banner, bio // Avatar, banner, bio
if (typeof _data.avatar !== 'undefined') { if (typeof _data.avatar !== 'undefined') {
_data.avatar = await DataResolver.resolveImage(_data.avatar); _data.avatar = await DataResolver.resolveImage(_data.avatar);

View File

@ -6,6 +6,7 @@ const VoiceState = require('./VoiceState');
const TextBasedChannel = require('./interfaces/TextBasedChannel'); const TextBasedChannel = require('./interfaces/TextBasedChannel');
const { Error } = require('../errors'); const { Error } = require('../errors');
const GuildMemberRoleManager = require('../managers/GuildMemberRoleManager'); const GuildMemberRoleManager = require('../managers/GuildMemberRoleManager');
const GuildMemberFlags = require('../util/GuildMemberFlags');
const Permissions = require('../util/Permissions'); const Permissions = require('../util/Permissions');
const Util = require('../util/Util'); const Util = require('../util/Util');
@ -96,6 +97,16 @@ class GuildMember extends Base {
this.communicationDisabledUntilTimestamp = this.communicationDisabledUntilTimestamp =
data.communication_disabled_until && Date.parse(data.communication_disabled_until); data.communication_disabled_until && Date.parse(data.communication_disabled_until);
} }
if ('flags' in data) {
/**
* The flags of this member
* @type {Readonly<GuildMemberFlags>}
*/
this.flags = new GuildMemberFlags(data.flags).freeze();
} else {
this.flags ??= new GuildMemberFlags().freeze();
}
} }
_ProfilePatch(data) { _ProfilePatch(data) {
@ -408,6 +419,16 @@ class GuildMember extends Base {
return this.edit({ nick }, reason); return this.edit({ nick }, reason);
} }
/**
* 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 guild avatar of the logged in client. * Sets the guild avatar of the logged in client.
* @param {?(BufferResolvable|Base64Resolvable)} avatar The new avatar * @param {?(BufferResolvable|Base64Resolvable)} avatar The new avatar
@ -582,6 +603,7 @@ class GuildMember extends Base {
this.bio === member.bio && this.bio === member.bio &&
this.pending === member.pending && this.pending === member.pending &&
this.communicationDisabledUntilTimestamp === member.communicationDisabledUntilTimestamp && this.communicationDisabledUntilTimestamp === member.communicationDisabledUntilTimestamp &&
this.flags.equals(member.flags) &&
(this._roles === member._roles || (this._roles === member._roles ||
(this._roles.length === member._roles.length && this._roles.every((role, i) => role === member._roles[i]))) (this._roles.length === member._roles.length && this._roles.every((role, i) => role === member._roles[i])))
); );

View File

@ -0,0 +1,43 @@
'use strict';
const BitField = require('./BitField');
/**
* Data structure that makes it easy to interact with an {@link GuildMember#flags} bitfield.
* @extends {BitField}
*/
class GuildMemberFlags extends BitField {}
/**
* @name GuildMemberFlags
* @kind constructor
* @memberof GuildMemberFlags
* @param {BitFieldResolvable} [bits=0] Bit(s) to read from
*/
/**
* Numeric guild member flags. All available properties:
* * `DID_REJOIN`
* * `COMPLETED_ONBOARDING`
* * `BYPASSES_VERIFICATION`
* * `STARTED_ONBOARDING`
* @type {Object}
* @see {@link https://discord.com/developers/docs/resources/guild#guild-member-object-guild-member-flags}
*/
GuildMemberFlags.FLAGS = {
DID_REJOIN: 1 << 0,
COMPLETED_ONBOARDING: 1 << 1,
BYPASSES_VERIFICATION: 1 << 2,
STARTED_ONBOARDING: 1 << 3,
};
/**
* Data that can be resolved to give a guild member flag bitfield. This can be:
* * A string (see {@link GuildMemberFlags.FLAGS})
* * A guild member flag
* * An instance of GuildMemberFlags
* * An Array of GuildMemberFlagsResolvable
* @typedef {string|number|GuildMemberFlags|GuildMemberFlagsResolvable[]} GuildMemberFlagsResolvable
*/
module.exports = GuildMemberFlags;

16
typings/index.d.ts vendored
View File

@ -1573,6 +1573,7 @@ export class GuildMember extends PartialTextBasedChannel(Base) {
public readonly displayColor: number; public readonly displayColor: number;
public readonly displayHexColor: HexColorString; public readonly displayHexColor: HexColorString;
public readonly displayName: string; public readonly displayName: string;
public flags: Readonly<GuildMemberFlags>;
public guild: Guild; public guild: Guild;
public readonly id: Snowflake; public readonly id: Snowflake;
public pending: boolean; public pending: boolean;
@ -1610,6 +1611,7 @@ export class GuildMember extends PartialTextBasedChannel(Base) {
public kick(reason?: string): Promise<GuildMember>; public kick(reason?: string): Promise<GuildMember>;
public permissionsIn(channel: GuildChannelResolvable): Readonly<Permissions>; public permissionsIn(channel: GuildChannelResolvable): Readonly<Permissions>;
public setNickname(nickname: string | null, reason?: string): Promise<GuildMember>; public setNickname(nickname: string | null, reason?: string): Promise<GuildMember>;
public setFlags(flags: GuildMemberFlagsResolvable): Promise<GuildMember>;
public setAvatar(avatar: BufferResolvable | Base64Resolvable | null): Promise<GuildMember>; public setAvatar(avatar: BufferResolvable | Base64Resolvable | null): Promise<GuildMember>;
public setBanner(banner: BufferResolvable | Base64Resolvable | null): Promise<GuildMember>; public setBanner(banner: BufferResolvable | Base64Resolvable | null): Promise<GuildMember>;
public setAboutMe(bio: string | null): Promise<GuildMember>; public setAboutMe(bio: string | null): Promise<GuildMember>;
@ -1620,6 +1622,11 @@ export class GuildMember extends PartialTextBasedChannel(Base) {
public setThemeColors(primary?: ColorResolvable, accent?: ColorResolvable): GuildMember; public setThemeColors(primary?: ColorResolvable, accent?: ColorResolvable): GuildMember;
} }
export class GuildMemberFlags extends BitField<GuildMemberFlagsString> {
public static FLAGS: Record<GuildMemberFlagsString, number>;
public static resolve(bit?: BitFieldResolvable<GuildMemberFlagsString, number>): number;
}
export class GuildPreview extends Base { export class GuildPreview extends Base {
private constructor(client: Client, data: RawGuildPreviewData); private constructor(client: Client, data: RawGuildPreviewData);
public approximateMemberCount: number; public approximateMemberCount: number;
@ -6215,11 +6222,20 @@ export interface GuildMemberEditData {
deaf?: boolean; deaf?: boolean;
channel?: GuildVoiceChannelResolvable | null; channel?: GuildVoiceChannelResolvable | null;
communicationDisabledUntil?: DateResolvable | null; communicationDisabledUntil?: DateResolvable | null;
flags?: GuildMemberFlagsResolvable;
avatar?: BufferResolvable | Base64Resolvable | null; avatar?: BufferResolvable | Base64Resolvable | null;
banner?: BufferResolvable | Base64Resolvable | null; banner?: BufferResolvable | Base64Resolvable | null;
bio?: string | null; bio?: string | null;
} }
export type GuildMemberFlagsString =
| 'DID_REJOIN'
| 'COMPLETED_ONBOARDING'
| 'BYPASSES_VERIFICATION'
| 'STARTED_ONBOARDING';
export type GuildMemberFlagsResolvable = BitFieldResolvable<GuildMemberFlagsString, number>;
export type GuildMemberResolvable = GuildMember | UserResolvable; export type GuildMemberResolvable = GuildMember | UserResolvable;
export type GuildResolvable = Guild | NonThreadGuildBasedChannel | GuildMember | GuildEmoji | Invite | Role | Snowflake; export type GuildResolvable = Guild | NonThreadGuildBasedChannel | GuildMember | GuildEmoji | Invite | Role | Snowflake;