discord.js 15.0.0-dev.1760443302-7a3a21b26 → 15.0.0-dev.1760616105-d03eb5e26

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "discord.js",
-  "version": "15.0.0-dev.1760443302-7a3a21b26",
+  "version": "15.0.0-dev.1760616105-d03eb5e26",
   "description": "A powerful library for interacting with the Discord API",
   "main": "./src/index.js",
   "types": "./typings/index.d.ts",
@@ -55,18 +55,18 @@
   "dependencies": {
     "@sapphire/snowflake": "3.5.5",
     "@vladfrangu/async_event_emitter": "^2.4.7",
-    "discord-api-types": "^0.38.29",
+    "discord-api-types": "^0.38.30",
     "fast-deep-equal": "3.1.3",
     "lodash.snakecase": "4.1.1",
     "magic-bytes.js": "^1.12.1",
     "tslib": "^2.8.1",
     "undici": "7.16.0",
-    "@discordjs/formatters": "^1.0.0-dev.1760443302-7a3a21b26",
-    "@discordjs/builders": "^2.0.0-dev.1760443302-7a3a21b26",
-    "@discordjs/collection": "^3.0.0-dev.1760443302-7a3a21b26",
-    "@discordjs/util": "^2.0.0-dev.1760443302-7a3a21b26",
-    "@discordjs/rest": "^3.0.0-dev.1760443302-7a3a21b26",
-    "@discordjs/ws": "^3.0.0-dev.1760443302-7a3a21b26"
+    "@discordjs/builders": "^2.0.0-dev.1760616105-d03eb5e26",
+    "@discordjs/collection": "^3.0.0-dev.1760616105-d03eb5e26",
+    "@discordjs/formatters": "^1.0.0-dev.1760616105-d03eb5e26",
+    "@discordjs/util": "^2.0.0-dev.1760616105-d03eb5e26",
+    "@discordjs/rest": "^3.0.0-dev.1760616105-d03eb5e26",
+    "@discordjs/ws": "^3.0.0-dev.1760616105-d03eb5e26"
   },
   "devDependencies": {
     "@favware/cliff-jumper": "^4.1.0",
@@ -82,9 +82,9 @@
     "tsd": "^0.33.0",
     "turbo": "^2.5.8",
     "typescript": "~5.9.3",
-    "@discordjs/api-extractor": "^7.52.7",
+    "@discordjs/docgen": "^0.12.1",
     "@discordjs/scripts": "^0.1.0",
-    "@discordjs/docgen": "^0.12.1"
+    "@discordjs/api-extractor": "^7.52.7"
   },
   "engines": {
     "node": ">=22.12.0"

package/src/structures/ModalSubmitInteraction.js

@@ -155,31 +155,49 @@ class ModalSubmitInteraction extends BaseInteraction {
     if (rawComponent.values) {
       data.values = rawComponent.values;
       if (resolved) {
-        const resolveCollection = (resolvedData, resolver) => {
-          const collection = new Collection();
-          for (const value of data.values) {
-            if (resolvedData?.[value]) {
-              collection.set(value, resolver(resolvedData[value]));
+        const { members, users, channels, roles } = resolved;
+        const valueSet = new Set(rawComponent.values);
+
+        if (users) {
+          data.users = new Collection();
+
+          for (const [id, user] of Object.entries(users)) {
+            if (valueSet.has(id)) {
+              data.users.set(id, this.client.users._add(user));
             }
           }
+        }
 
-          return collection.size ? collection : null;
-        };
+        if (channels) {
+          data.channels = new Collection();
 
-        const users = resolveCollection(resolved.users, user => this.client.users._add(user));
-        if (users) data.users = users;
+          for (const [id, apiChannel] of Object.entries(channels)) {
+            if (valueSet.has(id)) {
+              data.channels.set(id, this.client.channels._add(apiChannel, this.guild) ?? apiChannel);
+            }
+          }
+        }
 
-        const channels = resolveCollection(
-          resolved.channels,
-          channel => this.client.channels._add(channel, this.guild) ?? channel,
-        );
-        if (channels) data.channels = channels;
+        if (members) {
+          data.members = new Collection();
 
-        const members = resolveCollection(resolved.members, member => this.guild?.members._add(member) ?? member);
-        if (members) data.members = members;
+          for (const [id, member] of Object.entries(members)) {
+            if (valueSet.has(id)) {
+              const user = users?.[id];
+              data.members.set(id, this.guild?.members._add({ user, ...member }) ?? member);
+            }
+          }
+        }
+
+        if (roles) {
+          data.roles = new Collection();
 
-        const roles = resolveCollection(resolved.roles, role => this.guild?.roles._add(role) ?? role);
-        if (roles) data.roles = roles;
+          for (const [id, role] of Object.entries(roles)) {
+            if (valueSet.has(id)) {
+              data.roles.set(id, this.guild?.roles._add(role) ?? role);
+            }
+          }
+        }
       }
     }