daenamnu/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-06-01 16:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(GuildMember): add collectibles (#11468)

Browse Source 
feat(GuildMember): add collectibles, fix partial update handling
This commit is contained in:
Almeida
2026-03-29 10:19:42 +01:00
committed by GitHub
parent 22b820fbf2
commit 8bcf8c94e9
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/discord.js/src/structures/GuildMember.js
View File

@@ -5,6 +5,7 @@ const { DiscordjsError, ErrorCodes } = require('../errors/index.js');
const { GuildMemberRoleManager } = require('../managers/GuildMemberRoleManager.js');
const { GuildMemberFlagsBitField } = require('../util/GuildMemberFlagsBitField.js');
const { PermissionsBitField } = require('../util/PermissionsBitField.js');
const { _transformCollectibles } = require('../util/Transformers.js');
const { Base } = require('./Base.js');
const { VoiceState } = require('./VoiceState.js');
@@ -150,6 +151,17 @@ class GuildMember extends Base {
} else {
this.avatarDecorationData = null;
}
if ('collectibles' in data) {
/**
* The member's collectibles
*
* @type {?Collectibles}
*/
this.collectibles = data.collectibles ? _transformCollectibles(data.collectibles) : null;
} else {
this.collectibles ??= null;
}
}
_clone() {
@@ -599,7 +611,11 @@ class GuildMember extends Base {
(this._roles.length === member._roles.length &&
this._roles.every((role, index) => role === member._roles[index]))) &&
this.avatarDecorationData?.asset === member.avatarDecorationData?.asset &&
this.avatarDecorationData?.skuId === member.avatarDecorationData?.skuId
this.avatarDecorationData?.skuId === member.avatarDecorationData?.skuId &&
this.collectibles?.nameplate?.skuId === member.collectibles?.nameplate?.skuId &&
this.collectibles?.nameplate?.asset === member.collectibles?.nameplate?.asset &&
this.collectibles?.nameplate?.label === member.collectibles?.nameplate?.label &&
this.collectibles?.nameplate?.palette === member.collectibles?.nameplate?.palette
);
}

6
packages/discord.js/src/structures/User.js
View File

@@ -170,15 +170,15 @@ class User extends Base {
* @property {?NameplateData} nameplate The user's nameplate data
*/
if (data.collectibles) {
if ('collectibles' in data) {
/**
* The user's collectibles
*
* @type {?Collectibles}
*/
this.collectibles = _transformCollectibles(data.collectibles);
this.collectibles = data.collectibles ? _transformCollectibles(data.collectibles) : null;
} else {
this.collectibles = null;
this.collectibles ??= null;
}
/**

1
packages/discord.js/typings/index.d.ts vendored
View File

@@ -1638,6 +1638,7 @@ export class GuildMember extends Base {
public avatarDecorationData: AvatarDecorationData | null;
public banner: string | null;
public get bannable(): boolean;
public collectibles: Collectibles | null;
public get dmChannel(): DMChannel | null;
public get displayColor(): number;
public get displayHexColor(): HexColorString;