Merge pull request #491 from Faf4a/v6

[bug fix] some stuff

src/functions/array/arrayShuffle.js

@@ -3,12 +3,18 @@ module.exports = async d => {
     if (data.err) return d.error(data.err);
 
     const [name] = data.inside.splits;
-    d.arrays[name] = d.util.shuffleArray(d.arrays[name]);
+    const array = d.arrays[name];
+
+    for (let i = array.length - 1; i > 0; i--) {
+        const u = Math.floor(Math.random() * (i + 1));
+        [array[i], array[u]] = [array[u], array[i]];
+    }
+
     d.data.arrays = d.arrays;
 
     return {
         code: d.util.setCode(data),
         arrays: d.arrays,
         data: d.data,
     }
-}
+}

src/functions/guild/findGuild.js

@@ -0,0 +1,14 @@
+module.exports = async d => {
+    const data = d.util.aoiFunc(d);
+    if (data.err) return d.error(data.err);
+
+    const [resolve] = data.inside.splits;
+
+    const guild = d.client.guilds.cache.get(resolve) || d.client.guilds.cache.find(g => g.name.toLowerCase() === resolve.toLowerCase());
+
+    data.result = guild ? guild.id : undefined;
+
+    return {
+        code: d.util.setCode(data)
+    }
+}

src/functions/interaction/clear.js

@@ -1,56 +1,53 @@
 module.exports = async (d) => {
-    const {code} = d.command;
-    const inside = d.unpack();
-    const err = d.inside(inside);
-    if (err) return d.error(err);
-
-    let [amt, filter = "everyone", returnCount = "false", channelID = d.channel.id] =
-        inside.splits;
-
-    amt = Number(amt);
-    if (isNaN(amt))
-        return d.aoiError.fnError(
-            d,
-            "custom",
-            {inside},
-            "Invalid Amout Provided In",
-        );
-
-    const channel = await d.util.getChannel(d, channelID);
-    if (!channel) return d.aoiError.fnError(d, "channel", {inside});
-
-    let messages = await channel.messages
-        .fetch({limit: 100, cache: false})
-        .catch((err) => {
-            d.aoiError.fnError(
-                d,
-                "custom",
-                {},
-                "Failed To Fetch Messages With Reason: " + err,
-            );
-        });
-
-    messages = [...messages.filter((x) =>
-        filter === "everyone"
-            ? true
-            : filter === "unPins"
-                ? !x.pinned
-                : filter === "bot"
-                    ? x.author?.bot
-                    : x.author?.id === filter,
-    ).values()].slice(0, amt);
-
-    let result = await channel.bulkDelete(messages, true).catch((err) => {
-        d.aoiError.fnError(
-            d,
-            "custom",
-            {},
-            "Failed To Delete Message With Reason: " + err,
-        );
+  const data = d.util.aoiFunc(d);
+  const { code } = d.command;
+  if (data.err) return d.error(data.err);
+
+  let [channelID = d.channel.id, amount, filters = "everyone", returnCount = false ] = data.inside.splits;
+
+  if (isNaN(amount))
+    return d.aoiError.fnError(d, "custom", { inside: data.inside }, "Amount Provided In" );
+  amount = +amount + 1;
+
+  const channel = await d.util.getChannel(d, channelID);
+  if (!channel)
+    return d.aoiError.fnError(d, "channel", { inside: data.inside });
+
+  let messages = await channel.messages
+    .fetch({ limit: 100, cache: false })
+    .catch((err) => {
+      d.aoiError.fnError(d, "custom", {}, "Failed To Fetch Messages With Reason: " + err);
     });
-    result = returnCount === "true" ? result.size : undefined;
 
-    return {
-        code: d.util.setCode({function: d.func, code, inside, result}),
-    };
-};
+  filters = filters.toLowerCase().split(",");
+
+  messages = [...messages.values()]
+    .filter((x) => {
+      if (filters.includes("everyone")) return true;
+      if (filters.includes("notpinned") && x.pinned) return false;
+      if (filters.includes("bots") && x.author?.bot) return true;
+      if (
+        filters.some(
+          (filter) =>
+            filter.startsWith("user:") && x.author?.id === filter.split(":")[1]
+        )
+      )
+        return true;
+      return false;
+    })
+    .slice(0, amount);
+
+  if (!messages.length) {
+    messages = [...messages.values()].slice(0, amount);
+  }
+
+  let result = await channel.bulkDelete(messages, true).catch((err) => {
+    d.aoiError.fnError(d, "custom" ,{}, "Failed To Delete Message With Reason: " + err);
+  });
+
+  result = returnCount === true ? result.size : undefined;
+
+  return {
+    code: d.util.setCode({ function: d.func, code, inside: data.inside, result }),
+  };
+};

src/functions/interaction/killShard.js

@@ -2,7 +2,7 @@ module.exports = async d => {
     const data = d.util.aoiFunc(d);
     if (data.err) return d.error(data.err);
 
-    const shardId = data.inside.inside;
+    const [shardId = 0] = data.inside.splits;
 
     await d.client.shard.broadcastEval(c => {
         if (c.shard.ids.includes(Number(shardId))) process.exit();

src/functions/interaction/spawnShard.js

@@ -2,7 +2,7 @@ module.exports = async d => {
     const data = d.util.aoiFunc(d);
     if (data.err) return d.error(data.err);
 
-    const shardId = data.inside.inside;
+    const [shardId = 0] = data.inside.splits;
 
     await d.client.shard.broadcastEval(c => {
         if (c.shard.ids.includes(Number(shardId))) c.spawn();

src/functions/user/userID.js

@@ -7,7 +7,7 @@ module.exports = async d => {
     const res = d.client.users.cache.findKey(x => x.username.toLowerCase() === user.addBrackets().toLowerCase());
     if (!res) return d.aoiError.fnError(d, 'custom', {inside: data.inside}, 'Invalid User Provided In');
 
-    data.result = res.id;
+    data.result = res;
 
     return {
         code: d.util.setCode(data)

src/functions/util/charCount.js

@@ -1,11 +1,12 @@
-module.exports = async d => {
-    const data = d.util.aoiFunc(d);
+module.exports = async (d) => {
+  const data = d.util.aoiFunc(d);
+  const [text, find] = data.inside.splits;
 
-    const [text = d.args.join(" ")] = data.inside.splits;
+  data.result = find
+    ? (text.split(find).length - 1) * find.length
+    : text.length;
 
-    data.result = text.addBrackets().length
-
-    return {
-        code: d.util.setCode(data)
-    }
-}
+  return {
+    code: d.util.setCode(data),
+  };
+};

src/utils/CustomBox.js

@@ -1,33 +1,43 @@
 const chalk = require('chalk');
 
-function createCustomBoxedMessage(messages, borderColor = 'yellow', title = null) {
-    if (!Array.isArray(messages)) {
-        messages = [messages];
-    }
-
-    const maxLength = title
-        ? Math.max(...messages.map(msg => msg.text.length), title.text.length)
-        : Math.max(...messages.map(msg => msg.text.length));
-
-    const topBorder = chalk[borderColor](`╭${'─'.repeat(maxLength + 2)}╮`);
-    const bottomBorder = chalk[borderColor](`╰${'─'.repeat(maxLength + 2)}╯`);
-
-    console.log(topBorder);
-
-    if (title) {
-        const titlePadding = ' '.repeat((maxLength - title.text.length) / 2);
-        const titleText = `${chalk[borderColor]('│')} ${titlePadding}${chalk[title.textColor](title.text)}${titlePadding} ${chalk[borderColor]('│')}`;
-        console.log(titleText);
-    }
-
-    messages.forEach((message, index) => {
-        const padding = ' '.repeat(maxLength - message.text.length);
-        const textColor = message.textColor || 'reset'; // Default to reset color if not specified
-        const messageText = `${chalk[borderColor]('│')} ${chalk[textColor](message.text)}${padding} ${chalk[borderColor]('│')}`;
-        console.log(messageText);
-    });
-
-    console.log(bottomBorder);
+function createCustomBoxedMessage(
+  messages,
+  borderColor = "yellow",
+  title = null
+) {
+  if (!Array.isArray(messages)) {
+    messages = [messages];
+  }
+
+  const maxLength = title
+    ? Math.max(...messages.map((msg) => msg.text.length), title.text.length)
+    : Math.max(...messages.map((msg) => msg.text.length));
+
+  const topBorder = chalk[borderColor](`╭${"─".repeat(maxLength + 2)}╮`);
+  const bottomBorder = chalk[borderColor](`╰${"─".repeat(maxLength + 2)}╯`);
+
+  console.log(topBorder);
+
+  if (title) {
+    const titlePadding = " ".repeat((maxLength - title.text.length) / 2);
+    const titleText = `${chalk[borderColor]("│")} ${titlePadding}${chalk[
+      title.textColor
+    ](title.text)}${titlePadding} ${chalk[borderColor]("│")}`;
+    console.log(titleText);
+  }
+
+  messages.forEach((message, index) => {
+    const paddingLength = (maxLength - message.text.length) / 2;
+    const leftPadding = " ".repeat(Math.floor(paddingLength));
+    const rightPadding = " ".repeat(Math.ceil(paddingLength));
+    const textColor = message.textColor || "reset";
+    const messageText = `${chalk[borderColor]("│")} ${leftPadding}${chalk[
+      textColor
+    ](message.text)}${rightPadding} ${chalk[borderColor]("│")}`;
+    console.log(messageText);
+  });
+
+  console.log(bottomBorder);
 }
 
 module.exports = createCustomBoxedMessage;