djs-builder 0.6.17 → 0.6.19

package/function/function.js

@@ -60,6 +60,7 @@ async function Wait({
   const channel = context.channel;
   if (!channel) throw new Error("context must contain a valid channel.");
 
+
   if (type === "message") {
     try {
       const collected = await channel.awaitMessages({
@@ -73,64 +74,61 @@ async function Wait({
     }
   }
 
-  if (type === "interaction") {
-    const message = message_Wait;
-    if (!message)
-      throw new Error(
-        "You must provide messageWithButtons when using type 'button'."
-      );
-
-    try {
-      const collected = await message.awaitMessageComponent({
-        filter: (i) => !userId || i.user.id === userId,
-        time,
-      });
-      return collected ?? null;
-    } catch {
-      return null;
-    }
-  }
-
-  if (type === "both") {
-    if (!message_Wait)
-      throw new Error(
-        "You must provide messageWithButtons when using type 'both'."
-      );
 
+  if (type === "interaction" || type === "both") {
     return new Promise((resolve) => {
       const collectors = [];
 
-      const msgCollector = channel.createMessageCollector({
-        filter: (m) => !userId || m.author.id === userId,
-        max: 1,
-        time,
-      });
 
-      msgCollector.on("collect", (msg) => {
-        stop();
-        resolve({ type: "message", data: msg });
-      });
-      collectors.push(msgCollector);
+      if (type === "both") {
+        const msgCollector = channel.createMessageCollector({
+          filter: (m) => !userId || m.author.id === userId,
+          max: 1,
+          time,
+        });
 
-      const btnCollector = message_Wait.createMessageComponentCollector({
-        filter: (i) => !userId || i.user.id === userId,
-        max: 1,
-        time,
-      });
+        msgCollector.on("collect", (msg) => {
+          cleanup();
+          resolve(msg);
+        });
 
-      btnCollector.on("collect", (i) => {
-        stop();
-        resolve({ type: "button", data: i });
-      });
-      collectors.push(btnCollector);
+        collectors.push(msgCollector);
+      }
+
+      
+      if (message_Wait) {
+        const btnCollector = message_Wait.createMessageComponentCollector({
+          filter: (i) => !userId || i.user.id === userId,
+          max: 1,
+          time,
+        });
+
+        btnCollector.on("collect", (i) => {
+          cleanup();
+          resolve(i);
+        });
+
+        collectors.push(btnCollector);
+      }
+
+
+      const modalListener = (i) => {
+        if (!i.isModalSubmit()) return;
+        if (userId && i.user.id !== userId) return;
+        cleanup();
+        resolve(i);
+      };
+
+      context.client.on("interactionCreate", modalListener);
+      collectors.push({ stop: () => context.client.removeListener("interactionCreate", modalListener) });
 
       const timer = setTimeout(() => {
-        stop();
+        cleanup();
         resolve(null);
       }, time);
 
-      function stop() {
-        collectors.forEach((c) => c.stop());
+      function cleanup() {
+        collectors.forEach((c) => c.stop?.());
         clearTimeout(timer);
       }
     });
@@ -139,6 +137,9 @@ async function Wait({
   return null;
 }
 
+
+
+
 //////////////////////////////////* Row creat 🔩
 
 function CreateRow(components) {
@@ -187,8 +188,7 @@ function CreateRow(components) {
         value = false,
         id = false,
         max = false,
-        min = false,  
-        disabled = false
+        min = false,
       } = options;
 
       const selectOptions = data.map((item, index) => {
@@ -225,9 +225,9 @@ function CreateRow(components) {
         selectMenu.addOptions(selectOptions);
       }
 
-         if (options.hasOwnProperty("disabled")) {
-          selectMenu.setDisabled(options.disabled);
-        }
+      if (options.hasOwnProperty("disabled")) {
+        selectMenu.setDisabled(options.disabled);
+      }
 
       actionRows.push(new ActionRowBuilder().addComponents(selectMenu));
     } else {
@@ -245,21 +245,21 @@ async function GetUser(message) {
   let user = message.mentions.members.first();
   let new_args = args;
 
-
   if (!user && args[0]) {
     const userId = args[0];
     user = await message.guild.members.fetch(userId).catch(() => null);
     new_args = args.slice(1);
   }
 
-  
   if (!user && message.reference) {
     const repliedMessage = await message.channel.messages
       .fetch(message.reference.messageId)
       .catch(() => null);
 
     if (repliedMessage) {
-      user = await message.guild.members.fetch(repliedMessage.author.id).catch(() => null);
+      user = await message.guild.members
+        .fetch(repliedMessage.author.id)
+        .catch(() => null);
     }
   }
 
@@ -271,5 +271,4 @@ async function GetUser(message) {
   };
 }
 
-
-module.exports = { Wait, CreateBar, CreateRow , GetUser};
+module.exports = { Wait, CreateBar, CreateRow, GetUser };

package/package.json

@@ -1,7 +1,7 @@
 
 {
   "name": "djs-builder",
-  "version": "0.6.17",
+  "version": "0.6.19",
 "description": "🎉 Package Update! 🥏\n- Add option `disabled` to the selectMenu options \nNew features added:\n- `GetUser`: Easily fetch a user from **ID**, **mention**, or even from a **reply**.\n\n🛠 Fixes:\n- Minor bugs fixed\n- Improved stability and error handling\n\n🔗 Learn more on [NPM](https://www.npmjs.com/package/djs-builder)",
   "main": "handler/starter.js",
   "dependencies": {