Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-09 16:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(ModalSubmitInteraction): Resolve crash on handling populated select menus (#11158)

Browse Source 
* fix: handle receiving new selects

* fix: handle missing user object
This commit is contained in:
Jiralite
2025-10-08 22:07:48 +01:00
committed by GitHub
parent 1d5b9837de
commit 11b236ff65
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/discord.js/src/structures/ModalSubmitInteraction.js
View File

@@ -80,7 +80,10 @@ class ModalSubmitInteraction extends BaseInteraction {
* @type {Array<ActionRowModalData | LabelModalData | TextDisplayModalData>} * @type {Array<ActionRowModalData | LabelModalData | TextDisplayModalData>}
*/ */
this.components = data.data.components?.map(component => this.components = data.data.components?.map(component =>
ModalSubmitInteraction.transformComponent(component, data.data.resolved), ModalSubmitInteraction.transformComponent(component, data.data.resolved, {
client: this.client,
guild: this.guild,
}),
); );
/** /**
@@ -121,14 +124,17 @@ class ModalSubmitInteraction extends BaseInteraction {
* Transforms component data to discord.js-compatible data * Transforms component data to discord.js-compatible data
* @param {*} rawComponent The data to transform * @param {*} rawComponent The data to transform
* @param {APIInteractionDataResolved} [resolved] The resolved data for the interaction * @param {APIInteractionDataResolved} [resolved] The resolved data for the interaction
* @param {*} [extra] Extra data required for the transformation
* @returns {ModalData[]} * @returns {ModalData[]}
*/ */
static transformComponent(rawComponent, resolved) { static transformComponent(rawComponent, resolved, { client, guild } = {}) {
if ('components' in rawComponent) { if ('components' in rawComponent) {
return { return {
type: rawComponent.type, type: rawComponent.type,
id: rawComponent.id, id: rawComponent.id,
components: rawComponent.components.map(component => this.transformComponent(component, resolved)), components: rawComponent.components.map(component =>
this.transformComponent(component, resolved, { client, guild }),
),
}; };
} }
@@ -136,7 +142,7 @@ class ModalSubmitInteraction extends BaseInteraction {
return { return {
type: rawComponent.type, type: rawComponent.type,
id: rawComponent.id, id: rawComponent.id,
component: this.transformComponent(rawComponent.component, resolved), component: this.transformComponent(rawComponent.component, resolved, { client, guild }),
}; };
} }
@@ -164,19 +170,25 @@ class ModalSubmitInteraction extends BaseInteraction {
return collection.size ? collection : null; return collection.size ? collection : null;
}; };
const users = resolveCollection(resolved.users, user => this.client.users._add(user)); const users = resolveCollection(resolved.users, user => client.users._add(user));
if (users) data.users = users; if (users) data.users = users;
const channels = resolveCollection( const channels = resolveCollection(
resolved.channels, resolved.channels,
channel => this.client.channels._add(channel, this.guild) ?? channel, channel => client.channels._add(channel, guild) ?? channel,
); );
if (channels) data.channels = channels; if (channels) data.channels = channels;
const members = resolveCollection(resolved.members, member => this.guild?.members._add(member) ?? member); const members = new Collection();
if (members) data.members = members;
const roles = resolveCollection(resolved.roles, role => this.guild?.roles._add(role) ?? role); for (const [id, member] of Object.entries(resolved.members)) {
const user = users.get(id);
members.set(id, guild?.members._add({ user, ...member }) ?? member);
}
if (members.size > 0) data.members = members;
const roles = resolveCollection(resolved.roles, role => guild?.roles._add(role) ?? role);
if (roles) data.roles = roles; if (roles) data.roles = roles;
} }
} }