djs-builder 0.6.35 → 0.6.37

package/function/giveaway.js

@@ -1,13 +1,12 @@
 const { Schema, model } = require("mongoose");
-const { EmbedBuilder, embedLength } = require("discord.js");
+const { EmbedBuilder } = require("discord.js");
 const { CreateRow } = require("../function/function");
-const crypto = require("crypto");
 const giveawaySchema = new Schema({
   ended: { type: Boolean, default: false },
   guildId: { type: String, required: true },
   channelId: { type: String, required: true },
   messageId: { type: String, required: true },
-hoster: { type: String, required: true },
+  hoster: { type: String, required: true },
   endEmbed: { type: Object, required: true },
   winwesNumber: { type: Number, default: 1 },
   winers: Array,
@@ -34,46 +33,54 @@ async function Gstart({
   winers: winers,
   channelId: channelId,
   embed: {
-    custom: Scustom,
-    title: Stitle,
-    description: Sdescription,
-    color: Scolor,
-    image: Simage,
-    theumbnail: Sthumbnail,
-  },
+    custom: Scustom = false,
+    title: Stitle = false,
+    description: Sdescription = false,
+    color: Scolor = false,
+    image: Simage = false,
+    theumbnail: Sthumbnail = false,
+  } = {},
   endEmbed: {
-    custom: Ecustom,
-    title: Etitle,
-    description: Edescription,
-    color: Ecolor,
-    image: Eimage,
-    theumbnail: Ethumbnail,
+    custom: Ecustom = false,
+    title: Etitle = false,
+    description: Edescription = false,
+    color: Ecolor = false,
+    image: Eimage = false,
+    theumbnail: Ethumbnail = false,
+  } = {},
+  reaction: {
+    type: type = false,
+    emoji: emoji = false,
+    label: label = false,
+    style: style = false,
+    id : id = false
   },
-  reaction: { type: type, emoji: emoji, label: label, style: style },
 }) {
   if (!winers) winers = 1;
-  if (!endTime) return console.log("❌ No End Time provided");
-  if (!channelId) return console.log("❌ No Channel provided");
-  if (!type) return console.log("❌ No Type provided");
-  if (!emoji && !label) return console.log("❌ No Emoji or Label provided");
-  if (!emoji && type === "reaction") return console.log("❌ No Emoji provided");
+  if (!endTime) return { error: "End time is required." };
+  if (!channelId) return { error: "Channel ID is required." };
+  if (!context) return { error: "Context is required." };
+
+  if (type === "reaction" && !emoji) return { error: "Emoji is not required." };
 
   let row = [];
   if (type === "button") {
     row = CreateRow([
-      {
-        id: "djs-builder-giveaway",
-        style: style || 1,
-        label: label,
-        emoji: emoji,
-      },
+      [
+        {
+          id: id || "djs-builder-giveaway",
+          style: style || 1,
+          label: label,
+          emoji: emoji,
+        },
+      ],
     ]);
   }
 
   let embed;
 
   if (Scustom) {
-    embed = new EmbedBuilder(Scustom);
+    embed = Scustom;
   } else {
     embed = new EmbedBuilder()
       .setTitle(Stitle || "🎉 Giveaway")
@@ -93,7 +100,7 @@ async function Gstart({
   });
 
   const channel = await context.guild.channels.cache.get(channelId);
-  if (!channel) return console.log("❌ No Channel found");
+  if (!channel) return { error: "❌ No Channel found" };
 
   try {
     const message = await channel.send({
@@ -115,32 +122,30 @@ async function Gstart({
       if (Ethumbnail) end_embed.setThumbnail(Ethumbnail);
     }
 
-      end_embed.addFields({
-    name: "🎉 Giveaway",
-    value: `- Winer(s): ${winers}\n- Time : <t:${Math.floor(
-      endTime / 1000
-    )}:R>\n- Hosted By : ${context.user ? context.user : context.author}`,
-    inline: true,
-  });
-
-  console.log(context.author.id)
-await giveaway.create({
-  guildId: context.guild.id,
-  channelId: channelId,
-  messageId: message.id,
-  hoster: context.user ? context.user.id : context.author.id,
-  endTime: endTime,
-  endType: false,
-  paused: false,
-  pausedTime: [],
-  winers: [],
-  winwesNumber: winers,
-  ended: false,
-  reaction: type,
-  endEmbed: end_embed.toJSON(),
-  users: [],
-});
+    end_embed.addFields({
+      name: "🎉 Giveaway",
+      value: `- Winer(s): ${winers}\n- Time : <t:${Math.floor(
+        endTime / 1000
+      )}:R>\n- Hosted By : ${context.user ? context.user : context.author}`,
+      inline: true,
+    });
 
+    await giveaway.create({
+      guildId: context.guild.id,
+      channelId: channelId,
+      messageId: message.id,
+      hoster: context.user ? context.user.id : context.author.id,
+      endTime: endTime,
+      endType: false,
+      paused: false,
+      pausedTime: [],
+      winers: [],
+      winwesNumber: winers,
+      ended: false,
+      reaction: type,
+      endEmbed: end_embed.toJSON(),
+      users: [],
+    });
 
     if (type === "reaction") message.react(emoji);
   } catch (e) {
@@ -160,44 +165,37 @@ async function Gcheck(client) {
     }
   };
 
-  check(); 
+  check();
   setInterval(check, 10 * 1000);
 }
 
 //////////////////////////////////* Giveaway Pick Winners 🎛️
 
-
 function pickWinners(arr, count) {
   const shuffled = [...arr].sort(() => Math.random() - 0.5);
   return shuffled.slice(0, count);
 }
 
-
-
 //////////////////////////////////! Giveaway End 📆
 
-
 async function giveaway_end(client, g, type) {
-   
-
   const guild = await client.guilds.cache.get(g.guildId);
   const channel = await guild.channels.cache.get(g.channelId);
-  if (!channel) return console.log("❌ No Channel found");
+  if (!channel) return { error: "❌ No Channel found" };
   const message = await channel.messages.fetch(g.messageId);
-  if (!message) return console.log("❌ No Message found");
+  if (!message) return { error: "❌ No Message found" };
 
   try {
-
     let users_id = [];
     if (g.reaction === "reaction") {
       const reaction = message.reactions.cache.first();
       const users = await reaction.users.fetch();
       users_id = users.filter((u) => !u.bot).map((u) => u.id);
+    } else {
+      users_id = g.users;
     }
 
-
-
-        if (!users_id.length) {
+    if (!users_id.length) {
       await message.reply("❌ No Users found for this giveaway.");
       await giveaway.findOneAndUpdate(
         { messageId: message.id },
@@ -206,17 +204,16 @@ async function giveaway_end(client, g, type) {
       return;
     }
 
-
     const winners = pickWinners(users_id, g.winersNumber);
 
-
     await message.edit({
       embeds: [g.endEmbed],
+      components: [],
     });
     await message.reply({
       content: `🎉 **Giveaway Ended!**\n> Winner(s):\n- <@${winners
         .map((u) => `${u}`)
-        .join(">\n- <@")}>`,
+        .join(">, <@")}>`,
     });
 
     await giveaway.findOneAndUpdate(
@@ -232,41 +229,38 @@ async function giveaway_end(client, g, type) {
 
 async function Greroll(client, messageId) {
   const g = await giveaway.findOne({ messageId });
-  if (!g) return null;
+  if (!g) return { error: "❌ Giveaway Data Not Found" };
 
   const guild = await client.guilds.cache.get(g.guildId);
   const channel = await guild.channels.cache.get(g.channelId);
-  if (!channel) return console.log("❌ No Channel found");
+  if (!channel) return { error: "❌ No Channel found" };
   const message = await channel.messages.fetch(g.messageId);
-  if (!message) return console.log("❌ No Message found");
+  if (!message) return { error: "❌ No Message found" };
 
   try {
-
     let users_id = [];
     if (g.reaction === "reaction") {
       const reaction = message.reactions.cache.first();
       const users = await reaction.users.fetch();
       users_id = users.filter((u) => !u.bot).map((u) => u.id);
+    } else {
+      users_id = g.users;
     }
 
-
-
-        if (!users_id.length) {
+    if (!users_id.length) {
       await message.reply("❌ No Users found for this giveaway.");
-      await giveaway.findOneAndUpdate(
+      return giveaway.findOneAndUpdate(
         { messageId: message.id },
         { ended: true }
       );
-      return;
     }
 
-
     const winners = pickWinners(users_id, g.winersNumber);
 
     await message.reply({
-      content: `🔄️ **Giveaway Reroll!**\n> Winners:\n- <@${winners
+      content: `🔄️ **Giveaway Reroll!**\n> Winner(s):\n- <@${winners
         .map((u) => `${u}`)
-        .join(">\n- <@")}>`,
+        .join(">, <@")}>`,
     });
 
     let new_endType;
@@ -282,8 +276,6 @@ async function Greroll(client, messageId) {
       { messageId: messageId },
       { winers: winners, endType: new_endType }
     );
-
-   
   } catch (e) {
     console.log(e);
   }
@@ -304,14 +296,14 @@ async function Glist(type) {
       messageId: g.messageId,
       guildId: g.guildId,
       channelId: g.channelId,
-      hoster: g.hoster, 
+      hoster: g.hoster,
       ended: g.ended,
       endTime: g.endTime,
-      paused: g.paused, 
-      pausedTime: g.pausedTime, 
-      endType: g.endType, 
-      winers: g.winers, 
-      winwesNumber: g.winwesNumber, 
+      paused: g.paused,
+      pausedTime: g.pausedTime,
+      endType: g.endType,
+      winers: g.winers,
+      winwesNumber: g.winwesNumber,
       endEmbed: g.endEmbed,
     };
   });
@@ -321,22 +313,22 @@ async function Glist(type) {
 
 //////////////////////////////////* Giveaway Pause ⏸️
 
-async function Gpause(client ,messageId) {
+async function Gpause(client, messageId) {
   const g = await giveaway.findOne({ messageId });
-  if (!g) return null;
+  if (!g) return { error: "❌ Giveaway Data Not Found" };
 
-  if(g.paused === true) return console.log("❌ Giveaway Already Paused");
-  if(g.ended === true) return console.log("❌ Giveaway Already Ended");
+  if (g.paused === true) return { error: "❌ Giveaway Already Paused" };
+  if (g.ended === true) return { error: "❌ Giveaway Already Ended" };
 
-    const guild = await client.guilds.cache.get(g.guildId);
+  const guild = await client.guilds.cache.get(g.guildId);
   const channel = await guild.channels.cache.get(g.channelId);
-  if (!channel) return console.log("❌ No Channel found");
+  if (!channel) return { error: "❌ No Channel found" };
   const message = await channel.messages.fetch(g.messageId);
-  if (!message) return console.log("❌ No Message found");
+  if (!message) return { error: "❌ No Message found" };
 
-
-  console.log(g)
-  message.embeds[0].data.fields.find((f) => f.name === "🎉 Giveaway").value = `- Winer(s): ${g.winwesNumber}\n- Time : Pause ⏸️\n- Hosted By : <@${g.hoster}>`;
+  message.embeds[0].data.fields.find(
+    (f) => f.name === "🎉 Giveaway"
+  ).value = `- Winer(s): ${g.winwesNumber}\n- Time : Pause ⏸️\n- Hosted By : <@${g.hoster}>`;
 
   await message.edit({ embeds: [message.embeds[0]] });
   await giveaway.findOneAndUpdate(
@@ -347,25 +339,26 @@ async function Gpause(client ,messageId) {
 
 //////////////////////////////////* Giveaway Resume ▶️
 
-async function Gresume(client,messageId) {
+async function Gresume(client, messageId) {
   const g = await giveaway.findOne({ messageId });
-  if (!g) return null;
+  if (!g) return { error: "❌ Giveaway Data Not Found" };
+
+  if (g.paused === true) return { error: "❌ Giveaway Already Paused" };
+  if (g.ended === true) return { error: "❌ Giveaway Already Ended" };
 
-  if(g.paused === false) return console.log("❌ Giveaway Already Active");
-  if(g.ended === true) return console.log("❌ Giveaway Already Ended");
-  
-      const guild = await client.guilds.cache.get(g.guildId);
+  const guild = await client.guilds.cache.get(g.guildId);
   const channel = await guild.channels.cache.get(g.channelId);
-  if (!channel) return console.log("❌ No Channel found");
+  if (!channel) return { error: "❌ No Channel found" };
   const message = await channel.messages.fetch(g.messageId);
-  if (!message) return console.log("❌ No Message found");
+  if (!message) return { error: "❌ No Message found" };
 
-const time = Date.now() + g.pausedTime[g.pausedTime.length - 1];
-  console.log(g)
+  const time = Date.now() + g.pausedTime[g.pausedTime.length - 1];
 
-  message.embeds[0].data.fields.find((f) => f.name === "🎉 Giveaway").value = `- Winer(s): ${g.winwesNumber}\n- Time : <t:${Math.floor(
-      time / 1000
-    )}:R>\n- Hosted By : <@${g.hoster}>`;
+  message.embeds[0].data.fields.find(
+    (f) => f.name === "🎉 Giveaway"
+  ).value = `- Winer(s): ${g.winwesNumber}\n- Time : <t:${Math.floor(
+    time / 1000
+  )}:R>\n- Hosted By : <@${g.hoster}>`;
 
   await message.edit({ embeds: [message.embeds[0]] });
 
@@ -382,7 +375,7 @@ const time = Date.now() + g.pausedTime[g.pausedTime.length - 1];
 
 async function Gdelete(messageId) {
   const g = await giveaway.findOne({ messageId });
-  if (!g) return null;
+  if (!g) return { error: "❌ Giveaway Data Not Found" };
 
   await giveaway.findOneAndDelete({ messageId: messageId });
 
@@ -393,55 +386,57 @@ async function Gdelete(messageId) {
 }
 
 ////////////////////////////////////* Giveaway Add User
-
-async function GaddUser(messageId,client ,userId) {
+async function GaddUser(messageId, userId) {
   const g = await giveaway.findOne({ messageId });
-  if (!g) return null;
+  if (!g) return { error: "❌ Giveaway Data Not Found" };
 
+  const all_users = g.users || [];
+  if (all_users.includes(userId)) return { error: "❌ User Already Joined" };
 
-  await giveaway.findOneAndUpdate(
-    { messageId: messageId },
-    { $push: { users: userId } }
-  );
+  if (!all_users.includes(userId)) {
+    all_users.push(userId);
+    await giveaway.findOneAndUpdate({ messageId }, { users: all_users });
+  }
 }
 
-////////////////////////////////////! Giveaway remove User
-
+////////////////////////////////////! Giveaway Remove User
 async function GremoveUser(messageId, userId) {
   const g = await giveaway.findOne({ messageId });
-  if (!g) return null;
+  if (!g) return { error: "❌ Giveaway Data Not Found" };
 
-  await giveaway.findOneAndUpdate(
-    { messageId: messageId },
-    { $pull: { users: userId } }
-  );
+  const all_users = g.users || [];
+
+  if (!all_users.includes(userId)) return { error: "❌ User Not Joined" };
+
+  const index = all_users.indexOf(userId);
+  if (index !== -1) all_users.splice(index, 1);
+
+  await giveaway.findOneAndUpdate({ messageId }, { users: all_users });
 }
 
 ////////////////////////////////////* Giveaway Add Time
 
 async function GaddTime(messageId, client, time) {
   const g = await giveaway.findOne({ messageId });
-  if (!g) return null;
+  if (!g) return { error: "❌ Giveaway Data Not Found" };
 
-  if(g.paused === true) return console.log("❌ Giveaway Already Paused");
-  if(g.ended === true) return console.log("❌ Giveaway Already Ended");
+  if (g.paused === true) return { error: "❌ Giveaway Already Paused" };
+  if (g.ended === true) return { error: "❌ Giveaway Already Ended" };
 
-    const guild = await client.guilds.cache.get(g.guildId);
+  const guild = await client.guilds.cache.get(g.guildId);
   const channel = await guild.channels.cache.get(g.channelId);
-  if (!channel) return console.log("❌ No Channel found");
+  if (!channel) return { error: "❌ No Channel found" };
   const message = await channel.messages.fetch(g.messageId);
-  if (!message) return console.log("❌ No Message found");
+  if (!message) return { error: "❌ No Message found" };
   if (typeof time !== "number" || time <= 0)
-    return console.log("❌ Invalid time provided");
-const finel_time = Number(g.endTime) + Number(time);
-
-
-
-
- message.embeds[0].data.fields.find((f) => f.name === "🎉 Giveaway").value = `- Winer(s): ${g.winwesNumber}\n- Time : <t:${Math.floor(
-      finel_time / 1000
-    )}:R>\n- Hosted By : <@${g.hoster}>`;
+    return { error: "❌ Invalid time provided" };
+  const finel_time = Number(g.endTime) + Number(time);
 
+  message.embeds[0].data.fields.find(
+    (f) => f.name === "🎉 Giveaway"
+  ).value = `- Winer(s): ${g.winwesNumber}\n- Time : <t:${Math.floor(
+    finel_time / 1000
+  )}:R>\n- Hosted By : <@${g.hoster}>`;
 
   await message.edit({ embeds: [message.embeds[0]] });
 
@@ -453,29 +448,27 @@ const finel_time = Number(g.endTime) + Number(time);
 
 ////////////////////////////////////! Giveaway Remove Time
 
-async function GremoveTime(messageId,client, time) {
+async function GremoveTime(messageId, client, time) {
   const g = await giveaway.findOne({ messageId });
-  if (!g) return null;
+  if (!g) return { error: "❌ Giveaway Data Not Found" };
 
-  if(g.paused === true) return console.log("❌ Giveaway Already Paused");
-  if(g.ended === true) return console.log("❌ Giveaway Already Ended");
+  if (g.paused === true) return { error: "❌ Giveaway Already Paused" };
+  if (g.ended === true) return { error: "❌ Giveaway Already Ended" };
 
-    const guild = await client.guilds.cache.get(g.guildId);
+  const guild = await client.guilds.cache.get(g.guildId);
   const channel = await guild.channels.cache.get(g.channelId);
-  if (!channel) return console.log("❌ No Channel found");
+  if (!channel) return { error: "❌ No Channel found" };
   const message = await channel.messages.fetch(g.messageId);
-  if (!message) return console.log("❌ No Message found");
+  if (!message) return { error: "❌ No Message found" };
   if (typeof time !== "number" || time <= 0)
-    return console.log("❌ Invalid time provided");
-const finel_time = Number(g.endTime) - Number(time);
-
-
-
-
- message.embeds[0].data.fields.find((f) => f.name === "🎉 Giveaway").value = `- Winer(s): ${g.winwesNumber}\n- Time : <t:${Math.floor(
-      finel_time / 1000
-    )}:R>\n- Hosted By : <@${g.hoster}>`;
+    return { error: "❌ Invalid time provided" };
+  const finel_time = Number(g.endTime) - Number(time);
 
+  message.embeds[0].data.fields.find(
+    (f) => f.name === "🎉 Giveaway"
+  ).value = `- Winer(s): ${g.winwesNumber}\n- Time : <t:${Math.floor(
+    finel_time / 1000
+  )}:R>\n- Hosted By : <@${g.hoster}>`;
 
   await message.edit({ embeds: [message.embeds[0]] });
 
@@ -485,7 +478,13 @@ const finel_time = Number(g.endTime) - Number(time);
   );
 }
 
+////////////////////////////////////? Giveaway Data
 
+async function Gdata(messageId) {
+  const g = await giveaway.findOne({ messageId });
+  if (!g) return { error: "❌ Giveaway Data Not Found" };
+  return g;
+}
 
 module.exports = {
   Gstart,
@@ -498,5 +497,6 @@ module.exports = {
   GaddUser,
   GremoveUser,
   GaddTime,
-  GremoveTime
+  GremoveTime,
+  Gdata,
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "djs-builder",
-  "version": "0.6.35",
-  "note": "🎉 Package Update! 🥏\n\n- Add Giveaway System 🏆 \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)",
+  "version": "0.6.37",
+  "note": "🎉 Package Update! 🥏\n\n- Add Giveaway System 🎉 \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)",
   "description": "🎉 Package Update! 🥏",
   "main": "handler/starter.js",
   "dependencies": {