feat: Message Flags, fix: dmPermissions (#604)

USERSATOSHI · web-flow · commit 8cb43f118fc6 · 2024-05-30T16:54:23.000+05:30
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/classes/AoiError.js b/src/classes/AoiError.js
@@ -85,6 +85,7 @@ class AoiError {
                 content: options?.toString()?.trim() === "" ? " " : options?.toString()
             };
         }
+
         let msg;
         if (extraOptions.interaction) {
             if (options.content === "" && options.embeds?.length === 0 && options.files?.length === 0) return;
@@ -152,6 +153,7 @@ class AoiError {
         if (extraOptions.deleteCommand) {
             d.message.delete();
         }
+
         return msg;
     }
 
diff --git a/src/core/interpreter.js b/src/core/interpreter.js
@@ -105,6 +105,7 @@ const Interpreter = async (
         let embeds;
         let deleteIn;
         let suppressErrors;
+        let flags;
         let editIn = undefined;
         let error;
         let attachments = [];
@@ -509,6 +510,9 @@ const Interpreter = async (
             if (FuncData?.allowedMentions) {
                 allowedMentions = FuncData.allowedMentions;
             }
+            if (FuncData?.flags) {
+                flags = FuncData.flags;
+            }
             if (FuncData?.embeds) {
                 embeds = FuncData.embeds;
             }
@@ -584,6 +588,7 @@ const Interpreter = async (
                     embeds: embeds,
                     files: attachments,
                     components: components,
+                    flags,
                     allowedMentions: {
                         parse: allowedMentions,
                         repliedUser: reply?.user || false,
diff --git a/src/functions/interaction/clear.js b/src/functions/interaction/clear.js
@@ -1,55 +1,54 @@
 module.exports = async (d) => {
-  const data = d.util.aoiFunc(d);
-  const { code } = d.command;
-  if (data.err) return d.error(data.err);
+    const data = d.util.aoiFunc(d);
+    if (data.err) return d.error(data.err);
 
-  let [channelID = d.channel.id, amount, filters = "everyone", returnCount = "false" ] = data.inside.splits;
+    let [channelID = d.channel?.id, amount, filters, returnCount = "false"] = data.inside.splits;
 
-  if (isNaN(amount) || amount < 1) return d.aoiError.fnError(d, "custom", { inside: data.inside }, "Amount" );
+    if (isNaN(amount) || amount < 1) return d.aoiError.fnError(d, "custom", { inside: data.inside }, "Invalid Amount, must be a number and greater than 0");
 
-  amount = Number(amount)
+    amount = Number(amount);
 
-  if (amount > 100) amount = 100
+    if (amount > 100) amount = 100;
 
-  const channel = await d.util.getChannel(d, channelID);
-  if (!channel) return d.aoiError.fnError(d, "channel", { inside: data.inside });
+    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: amount, cache: true })
-    .catch((err) => {
-      d.aoiError.fnError(d, "custom", {}, "Failed To Fetch Messages With Reason: " + err);
+    let messages = await channel.messages.fetch({ limit: amount, cache: true }).catch((err) => {
+        d.aoiError.fnError(d, "custom", {}, "Failed To Fetch Messages With Reason: " + err);
     });
 
-  filters = filters.toLowerCase().split(",");
-
-  messages = [...messages.values()]
-    .filter((x) => {
-      if (filters.includes("")) return true;
-      if (filters.includes("everyone")) return true;
-      if (filters.includes("unpinned") && !x.pinned) return true;
-      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" ? messages.length : null;
-
-  return {
-    code: d.util.setCode({ function: d.func, code, inside: data.inside, result }),
-  };
+    filters = filters
+        .split("}")
+        .map(function (x) {
+            x = x.replace("{", "").trim();
+            if (x.length === 0) return null;
+            let [key, value] = x.split(":");
+            return { [key]: value.split(",") };
+        })
+        .filter(Boolean);
+
+    messages = [...messages.values()]
+        .filter((x) => {
+            let passed = false;
+            for (let filter of filters) {
+                let key = Object.keys(filter)[0];
+                let value = filter[key];
+                if (key === "users" && value.includes(x.author?.id)) passed = true;
+                if (key === "words" && value.some((word) => x.content.includes(word))) passed = true;
+                if (key === "bots" && x.author?.bot === (value === "true")) passed = true;
+                if (key === "unpinned" && x.pinned !== (value === "true")) passed = true;
+            }
+            return passed;
+        })
+        .slice(0, amount);
+
+    const result = await channel.bulkDelete(messages, true).catch((err) => {
+        d.aoiError.fnError(d, "custom", {}, "Failed To Delete Message With Reason: " + err);
+    });
+
+    data.result = returnCount === "true" ? result.size : null;
+
+    return {
+        code: d.util.setCode(data)
+    };
 };
diff --git a/src/functions/interaction/createApplicationCommand.js b/src/functions/interaction/createApplicationCommand.js
@@ -6,12 +6,12 @@ module.exports = async (d) => {
     const data = d.util.aoiFunc(d);
     if (data.err) return d.error(data.err);
 
-    let [guildID, name, description, defaultPermission = "true", dmPermissions = "true", type = "slash", ...opts] = data.inside.splits;
+    let [guildID, name, description, defaultPermission = "true", dmPermission = "true", type = "slash", ...opts] = data.inside.splits;
     name = name.addBrackets();
     let options;
     let appData;
 
-    if (dmPermissions != "true" && dmPermissions != "false") return d.aoiError.fnError(d, "custom", {}, "dmPermissions expects to be boolean");
+    if (dmPermission != "true" && dmPermission != "false") return d.aoiError.fnError(d, "custom", {}, "dmPermission expects to be boolean");
     if (defaultPermission != "true" && defaultPermission != "false") return d.aoiError.fnError(d, "custom", {}, "defaultPermission expects to be boolean");
 
     const guild = guildID === "global" ? undefined : guildID === "custom" ? "custom" : await d.util.getGuild(d, guildID);
@@ -45,7 +45,7 @@ module.exports = async (d) => {
                 type,
                 description: description?.addBrackets(),
                 defaultMemberPermission: defaultPermission === "true",
-                dmPermissions: dmPermissions === "true",
+                dmPermission: dmPermission === "true",
                 options
             },
             guildID: guild?.id
diff --git a/src/functions/util/addMessageFlags.js b/src/functions/util/addMessageFlags.js
@@ -0,0 +1,22 @@
+const { MessageFlags } = require("discord.js");
+
+module.exports = async (d) => {
+    const data = d.util.aoiFunc(d);
+    if (data.err) return d.error(data.err);
+
+    const [channelId, messageId, ...flags] = data.inside.splits;
+
+    const channel = await d.util.getChannel(d, channelId);
+    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 });
+
+    message.edit({ flags: flags.map((x) => MessageFlags[x.trim()]) }).catch((err) => {
+        return d.aoiError.fnError(d, "custom", {}, "Failed To Add Message Flags With Reason: " + err);
+    });
+
+    return {
+        code: d.util.setCode(data)
+    };
+};
diff --git a/src/functions/util/setMessageFlags.js b/src/functions/util/setMessageFlags.js
@@ -0,0 +1,13 @@
+const { MessageFlags } = require("discord.js");
+
+module.exports = async (d) => {
+    const data = d.util.aoiFunc(d);
+    if (data.err) return d.error(data.err);
+
+    const [...flags] = data.inside.splits;
+
+    return {
+        code: d.util.setCode(data),
+        flags: flags.map((x) => MessageFlags[x.trim()])
+    };
+};
diff --git a/src/handler/parsers.js b/src/handler/parsers.js
@@ -371,6 +371,7 @@ const errorHandler = async (errorMessage, d, returnMsg = false, channel) => {
     let reactions = [];
     const embeds = [];
     const components = [];
+    const flags = [];
 
     let reply = {
         message: undefined,
@@ -382,6 +383,10 @@ const errorHandler = async (errorMessage, d, returnMsg = false, channel) => {
         messages: []
     };
 
+    let allowedMentions = {
+        parse: ["everyone", "users", "roles"]
+    }
+
     const parts = CreateObjectAST(errorMessage);
     for (const part of parts) {
         errorMessage = errorMessage.replace(part, "");
@@ -411,6 +416,17 @@ const errorHandler = async (errorMessage, d, returnMsg = false, channel) => {
         } else if (specialChecker(part, "ephemeral")) ephemeral = true;
         else if (Checker(part, "deleteIn")) deleteIn = part.split(":")[1].trim();
         else if (Checker(part, "reactions")) reactions = reactionParser(part.split(":").slice(1).join(":").replace("}", ""));
+        else if (Checker(part, "allowedMentions")) {
+            const parts = part.split(":")[1].split("}")[0].split(",");
+            if (parts.includes("all")) allowedMentions.parse = ["everyone", "users", "roles"];
+            else if (parts.includes("none")) allowedMentions.parse = [];
+            else if (parts.includes("")) allowedMentions.parse = [];
+            else allowedMentions.parse = [...parts];
+        }
+        else if (Checker(part, "flags")) {
+            const parts = part.split(":")[1].split("}")[0].split(",");
+            flags.push(parts.map(x => Discord.MessageFlags[x.trim()]));
+        }
     }
 
     if (!embeds.length) send = false;
@@ -423,6 +439,8 @@ const errorHandler = async (errorMessage, d, returnMsg = false, channel) => {
             components,
             content: errorMessage.addBrackets() === "" ? " " : errorMessage.addBrackets(),
             files,
+            allowedMentions,
+            flags,
             options: {
                 reply,
                 reactions: reactions.length ? reactions : undefined,
@@ -432,7 +450,7 @@ const errorHandler = async (errorMessage, d, returnMsg = false, channel) => {
                 defer,
                 edits: edits.edits,
                 deleteIn,
-                deleteCommand
+                deleteCommand,
             }
         };
     }

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ class AoiError {`
`85`	`85`	`content: options?.toString()?.trim() === "" ? " " : options?.toString()`
`86`	`86`	`};`
`87`	`87`	`}`
	`88`	`+`
`88`	`89`	`let msg;`
`89`	`90`	`if (extraOptions.interaction) {`
`90`	`91`	`if (options.content === "" && options.embeds?.length === 0 && options.files?.length === 0) return;`
`@@ -152,6 +153,7 @@ class AoiError {`
`152`	`153`	`if (extraOptions.deleteCommand) {`
`153`	`154`	`d.message.delete();`
`154`	`155`	`}`
	`156`	`+`
`155`	`157`	`return msg;`
`156`	`158`	`}`
`157`	`159`