Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 8, 2025
+21 −9
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd86bed
fix: handle receiving new selects
Jiralite Oct 8, 2025
33d44a6
fix: handle missing user object
Jiralite Oct 8, 2025
dfd1c81
Merge branch 'v14' into fix/modal-select-resolving
Jiralite Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions packages/discord.js/src/structures/ModalSubmitInteraction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@ class ModalSubmitInteraction extends BaseInteraction {
* @type {Array<ActionRowModalData | LabelModalData | TextDisplayModalData>}
*/
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,
}),
);

/**
Expand Down Expand Up @@ -121,22 +124,25 @@ class ModalSubmitInteraction extends BaseInteraction {
* Transforms component data to discord.js-compatible data
* @param {*} rawComponent The data to transform
* @param {APIInteractionDataResolved} [resolved] The resolved data for the interaction
* @param {*} [extra] Extra data required for the transformation
* @returns {ModalData[]}
*/
static transformComponent(rawComponent, resolved) {
static transformComponent(rawComponent, resolved, { client, guild } = {}) {
if ('components' in rawComponent) {
return {
type: rawComponent.type,
id: rawComponent.id,
components: rawComponent.components.map(component => this.transformComponent(component, resolved)),
components: rawComponent.components.map(component =>
this.transformComponent(component, resolved, { client, guild }),
),
};
}

if ('component' in rawComponent) {
return {
type: rawComponent.type,
id: rawComponent.id,
component: this.transformComponent(rawComponent.component, resolved),
component: this.transformComponent(rawComponent.component, resolved, { client, guild }),
};
}

Expand Down Expand Up @@ -164,19 +170,25 @@ class ModalSubmitInteraction extends BaseInteraction {
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;

const channels = resolveCollection(
resolved.channels,
channel => this.client.channels._add(channel, this.guild) ?? channel,
channel => client.channels._add(channel, guild) ?? channel,
);
if (channels) data.channels = channels;

const members = resolveCollection(resolved.members, member => this.guild?.members._add(member) ?? member);
if (members) data.members = members;
const members = new Collection();

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;
}
}
Expand Down