[pull] main from discordjs:main

packages/core/src/api/channel.ts

@@ -31,7 +31,6 @@ import {
 	type RESTPostAPIChannelWebhookJSONBody,
 	type RESTPostAPIChannelWebhookResult,
 	type RESTPostAPIGuildForumThreadsJSONBody,
-	type RESTPostAPISendSoundboardSoundResult,
 	type RESTPostAPISoundboardSendSoundJSONBody,
 	type RESTPutAPIChannelPermissionJSONBody,
 	type RESTPutAPIChannelRecipientJSONBody,
@@ -702,11 +701,11 @@ export class ChannelsAPI {
 		body: RESTPostAPISoundboardSendSoundJSONBody,
 		{ auth, signal }: Pick<RequestData, 'auth' | 'signal'> = {},
 	) {
-		return this.rest.post(Routes.sendSoundboardSound(channelId), {
+		await this.rest.post(Routes.sendSoundboardSound(channelId), {
 			auth,
 			body,
 			signal,
-		}) as Promise<RESTPostAPISendSoundboardSoundResult>;
+		});
 	}
 
 	/**

packages/discord.js/src/structures/GuildMember.js

@@ -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
     );
   }
 

packages/discord.js/src/structures/User.js

@@ -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;
     }
 
     /**

packages/discord.js/typings/index.d.ts

@@ -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;