Bugs, Features etc.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -8,6 +8,11 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this bug report! Fill in the blanks by following the steps. 🙌
+
+        Please **ensure the following** before reporting a bug:
+
+        - ✅ I am using the latest version of aoi.js (v6.6.1).
+        - ✅ I am using a version of NodeJS (v20.5.1 or newer).
 
   - type: dropdown
     id: type
@@ -39,31 +44,7 @@ body:
         }
     validations:
       required: true
-
-  - type: dropdown
-    id: aoijs-version
-    attributes:
-      label: Version of aoi.js
-      description: What version of aoi.js are you using?
-      options:
-        - v6.5.0
-        - v6.4.0
-        - v6.3.0
-    validations:
-      required: true
-
-  - type: dropdown
-    id: node-version
-    attributes:
-      label: Version of Node.js
-      description: Also, what version of Node.js are you using? 
-      options:
-        - v16.11.0 (Lowest)
-        - v18.17.1 (LTS)
-        - v20.5.1 (Current)
-    validations:
-      required: true
-
+
   - type: textarea
     id: excepted
     attributes:

.github/labeler.yml

@@ -1,18 +1,11 @@
-Client:
-  - any: ['src/structures/Client.ts', 'src/functions/discord/client/*']
-
-Classes: 
-  - src/structures/*
-
-Manager:
-  - src/manager/*
-
-Core:
-  - src/core/**/*
+# See https://github.com/actions/labeler
 
-Functions:Discord: 
-  - src/functions/discord/**/*
-
-Functions:JS:
-  - src/functions/js/**/*
+'Core':
+  - src/core/**
+  - src/classes/**
+
+'Function':
+  - src/functions/**
 
+'Client':
+  - src/classes/AoiClient.js

.github/workflows/add-feature-label.yml

@@ -11,14 +11,17 @@ jobs:
         uses: actions/checkout@v2
       - name: Find new files in src directory
         run: |
-          NEW_FILES=$(git diff --name-only HEAD^ HEAD)
-          CHANGED_FILES=()
-          for file in $NEW_FILES; do
-            if [[ $file == "src/"* ]]; then
-              CHANGED_FILES+=("$file")
-            fi
-          done
-          echo "::set-output name=changed_files::${CHANGED_FILES[*]}"
+          if [ $(git rev-list --count HEAD) -gt 1 ]
+          then
+            NEW_FILES=$(git diff --name-only HEAD^ HEAD)
+            CHANGED_FILES=()
+            for file in $NEW_FILES; do
+              if [[ $file == "src/"* ]]; then
+                CHANGED_FILES+=("$file")
+              fi
+            done
+            echo "::set-output name=changed_files::${CHANGED_FILES[*]}"
+          fi
         id: find-files
       - name: Add Feature label
         if: ${{ steps.find-files.outputs.changed_files != '' }}

.github/workflows/publish-dev.yml

@@ -11,17 +11,17 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Install Node v16
+      - name: Install Node v20.5.1
         uses: actions/setup-node@v2
         with:
-          node-version: 16
+          node-version: 20.5.1
           registry-url: https://registry.npmjs.org/
 
       - name: Install dependencies
         run: npm ci --ignore-scripts
 
       - name: Deprecate old versions
-        run: npm deprecate aoi.js@"~6.1.0-dev" "This is no longer supported" || true
+        run: npm deprecate aoi.js@"~6.6.1-dev" "This is no longer supported" || true
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
 

src/classes/AoiError.js

@@ -83,13 +83,13 @@ class AoiError {
     if (typeof options === "object") {
       options.content = options.content?.toString()?.trim() || " ";
       if (options.embeds && typeof options.embeds === "string") {
-        options.embeds = await EmbedParser(options.embeds);
+        options.embeds = await EmbedParser(options.embeds, d);
       }
       if (options.files && typeof options.files === "string") {
-        options.files = FileParser(options.files);
+        options.files = FileParser(options.files, d);
       }
       if (options.components && typeof options.components === "string") {
-        options.components = await ComponentParser(options.components, client);
+        options.components = await ComponentParser(options.components, d);
       }
     } else {
       options = {

src/core/interpreter.js

@@ -406,17 +406,28 @@ const Interpreter = async (
                             );
                             if (client.aoiOptions.suppressAllErrors) {
                                 if (client.aoiOptions.errorMessage) {
-                                    if (!message || !message.channel) {
+                                    const msg = message;
+                                    if (!msg || !msg.channel) {
                                         console.error(client.aoiOptions.errorMessage.addBrackets());
                                     } else {
-                                        const {
-                                            makeMessageError,
-                                        } = require("../classes/AoiError.js");
-                                        const message = await Util.errorParser(client.aoiOptions.errorMessage, d);
+                                        const { makeMessageError } = require("../classes/AoiError.js");
+
+                                        const result = await Interpreter(
+                                            client,
+                                            msg ?? data,
+                                            args ?? [],
+                                            { name: "parser", code: client.aoiOptions.errorMessage },
+                                            client.db,
+                                            true,
+                                            msg.channel ?? [],
+                                        );
+
+                                        const message = await Util.errorParser(result.code ?? client.aoiOptions.errorMessage, d); // (?) support for parser and regular functions
 
                                         if (!errorOccurred) {
                                             await makeMessageError(client, channel, message.data ?? message, message.options, d);
                                         }
+
                                         errorOccurred = true;
                                     }
                                 }

src/functions/event/interactionEdit.js

@@ -4,9 +4,9 @@ module.exports = async d => {
 
     let [content = "", embeds = "", components = "", files = "", allowedMentions = "all"] = data.inside.splits;
 
-    embeds = await d.util.parsers.EmbedParser(embeds);
+    embeds = await d.util.parsers.EmbedParser(embeds, d);
 
-    components = await d.util.parsers.ComponentParser(components, d.client);
+    components = await d.util.parsers.ComponentParser(components, d);
 
     files = await d.util.parsers.FileParser(files);
 

src/functions/event/interactionFollowUp.js

@@ -4,9 +4,9 @@ module.exports = async d => {
 
     let [content = "", embeds = "", components = "", files = "", ephemeral = "false"] = data.inside.splits
 
-    embeds = await d.util.parsers.EmbedParser(embeds);
+    embeds = await d.util.parsers.EmbedParser(embeds, d);
 
-    components = await d.util.parsers.ComponentParser(components, d.client);
+    components = await d.util.parsers.ComponentParser(components, d);
 
     files = await d.util.parsers.FileParser(files);
 

src/functions/event/interactionReply.js

@@ -4,9 +4,9 @@ module.exports = async d => {
 
     let [content = "", embeds = "", components = "", files = "", allowedMentions = "all", ephemeral = "false"] = data.inside.splits
 
-    embeds = await d.util.parsers.EmbedParser(embeds);
+    embeds = await d.util.parsers.EmbedParser(embeds, d);
 
-    components = await d.util.parsers.ComponentParser(components, d.client);
+    components = await d.util.parsers.ComponentParser(components, d);
 
     files = await d.util.parsers.FileParser(files);
 

src/functions/event/interactionUpdate.js

@@ -5,9 +5,9 @@ module.exports = async d => {
 
     let [content = "", embeds = "", components = "", files = ""] = data.inside.splits
 
-    embeds = await d.util.parsers.EmbedParser(embeds);
+    embeds = await d.util.parsers.EmbedParser(embeds, d);
 
-    components = await d.util.parsers.ComponentParser(components, d.client);
+    components = await d.util.parsers.ComponentParser(components, d);
 
     files = await d.util.parsers.FileParser(files);
 

src/functions/info/reactionCount.js

@@ -5,22 +5,22 @@ module.exports = async (d) => {
     const [channelID, messageID, emojiResolver] = data.inside.splits;
 
     const channel = await d.util.getChannel(d, channelID);
-    if (!channel)
-        return d.aoiError.fnError(d, "channel", {inside: data.inside});
+    if (!channel) return d.aoiError.fnError(d, "channel", { inside: data.inside });
 
     const message = await d.util.getMessage(channel, messageID);
-    if (!message)
-        return d.aoiError.fnError(d, "message", {inside: data.inside});
+    if (!message) return d.aoiError.fnError(d, "message", { inside: data.inside });
 
-    const emoji = message.reactions.cache.find(
-        (x) =>
-            x.emoji.id === emojiResolver ||
-            x.emoji.toString().toLowerCase() ===
-            emojiResolver.addBrackets().toLowerCase(),
-    );
-    if (!emoji) return d.aoiError.fnError(d, "emoji", {inside: data.inside});
+    let emoji;
 
-    data.result = emoji.count;
+    try {
+        emoji = message.reactions.cache.find((x) => x.emoji.id === d.util.getEmoji(d, emojiResolver).id)?.count;
+    } catch {
+        emoji = message.reactions.cache.find((x) => x.emoji.toString().toLowerCase() === emojiResolver.toLowerCase())?.count;
+    } finally {
+        emoji = emoji ?? 0;
+    }
+
+    data.result = emoji;
 
     return {
         code: d.util.setCode(data),

src/functions/interaction/addButton.js

@@ -1,31 +1,43 @@
 module.exports = async (d) => {
-    const {code} = d.command;
-    const inside = d.unpack();
-    const err = d.inside(inside);
-    if (err) return d.error(err);
-    let [index, label, style, custom, disabled = "false", emoji] = inside.splits;
-    if (isNaN(index) || Number(index) < 1)
-        d.aoiError.fnError(d, "custom", {inside}, "Invalid Index Provided In");
-    index = Number(index) - 1;
-    style = isNaN(style)
-        ? d.util.constants.ButtonStyleOptions[style]
-        : Number(style);
-    disabled = disabled === "true";
-    if (!style || style > 5 || style < 1)
-        d.aoiError.fnError(d, "custom", {inside}, "Invalid Style Provided In");
-    if (!d.components[index]) d.components[index] = {type: 1, components: []};
-    const button = {
-        label,
-        type: 2,
-        style,
-        disabled,
-        emoji,
-    };
-    button[style === 5 ? "url" : "customId"] = custom;
-    d.components[index].components.push(button);
-    return {
-        code: d.util.setCode({function: d.func, inside, code, result: ""}),
-        data: { ...d.data, components: Object.assign({}, d.data.components, d.components) },
-        components: d.components,
-    };
+  const data = d.util.aoiFunc(d);
+  const { code } = d.command;
+  if (data.err) return d.error(data.err);
+
+  let [index, label, style, custom, disabled = "false", emoji] = data.inside.splits;
+
+  if (isNaN(index) || Number(index) < 1) return d.aoiError.fnError(d, "custom", { inside: data.inside }, "Index");
+
+  index = Number(index) - 1;
+  style = isNaN(style) ? d.util.constants.ButtonStyleOptions[style] : Number(style);
+  disabled = disabled === "true";
+
+  if (!style || style > 5 || style < 1) return d.aoiError.fnError(d, "custom", { inside: data.inside }, "Style");
+
+  try {
+    emoji = d.util.getEmoji(d, emoji.addBrackets()).id;
+  } catch {
+    emoji = emoji?.addBrackets() ?? undefined;
+  }
+
+  const button = {
+    label,
+    type: 2,
+    style,
+    disabled,
+    emoji,
+  };
+
+  button[style === 5 ? "url" : "customId"] = custom;
+
+  if (!d.components[index]) d.components[index] = { type: 1, components: [] };
+  d.components[index].components.push(button);
+
+  return {
+    code: d.util.setCode({ function: d.func, inside: data.inside, code }),
+    data: {
+      ...d.data,
+      components: Object.assign({}, d.data.components, d.components),
+    },
+    components: d.components,
+  };
 };

src/functions/interaction/addClientReactions.js

@@ -1,15 +1,25 @@
 module.exports = async (d) => {
-    const data = d.util.aoiFunc(d);
-    if (data.err) return d.error(data.err);
+  const data = d.util.aoiFunc(d);
+  if (data.err) return d.error(data.err);
 
-    let [...reactions] = data.inside.splits;
+  let [...reactions] = data.inside.splits;
 
-    reactions = reactions.map(x => x.addBrackets()).reverse();
+  reactions = reactions.map((x) => {
+    try {
+      let emoji = d.util.getEmoji(d, x.addBrackets());
+      x = emoji.id ? `:${emoji.name}:${emoji.id}` : emoji.name;
+    } catch {
+      x = x?.addBrackets() ?? undefined;
+    } finally {
+      if (x === undefined) return d.util.aoiError.fnError(d, "custom", { inside: data.inside }, "Emoji");
+    }
+    return x;
+  });
 
-    data.result = ""
+  data.result = "";
 
-    return {
-        code: d.util.setCode(data),
-        reactions,
-    };
+  return {
+    code: d.util.setCode(data),
+    reactions,
+  };
 };