Merge pull request #486 from ethann2004/v6

$hasAttachment and Disable Mentions
aoijs · Oct 7, 2023 · 3ce2971 · 3ce2971
2 parents 1b9f946 + 348990c
commit 3ce2971
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/src/functions/event/interactionEdit.js b/src/functions/event/interactionEdit.js
@@ -10,22 +10,21 @@ module.exports = async d => {
 
     files = await d.util.parsers.FileParser(files);
 
-    allowedMentions = allowedMentions === "all" ? ["everyone", "users", "roles"] : allowedMentions?.split(",") || [];
+    allowedMentions = allowedMentions === "all" ? [ "everyone", "users", "roles" ] : (allowedMentions ? allowedMentions?.split(",") : []);
 
     await d.data.interaction?.editReply({
-            content: content.trim() === "" ? " " : content.addBrackets(),
-            embeds: embeds,
-            components: components,
-            files,
-            allowedMentions: {
-                parse: allowedMentions
-            }
+        content: content.trim() === "" ? " " : content.addBrackets(),
+        embeds: embeds,
+        components: components,
+        files,
+        allowedMentions: {
+            parse: allowedMentions
         }
-    ).catch(e => {
+    }).catch(e => {
         d.aoiError.fnError(d, 'custom', {}, 'Failed To Reply With Reason: ' + e)
     });
 
     return {
         code: d.util.setCode(data)
     }
-}
+}
diff --git a/src/functions/event/interactionReply.js b/src/functions/event/interactionReply.js
@@ -10,7 +10,7 @@ module.exports = async d => {
 
     files = await d.util.parsers.FileParser(files);
 
-    allowedMentions = allowedMentions === "all" ? [ "everyone", "users", "roles" ] : allowedMentions?.split( "," ) || [];
+    allowedMentions = allowedMentions === "all" ? [ "everyone", "users", "roles" ] : (allowedMentions ? allowedMentions?.split(",") : []);
 
     await d.data.interaction?.reply({
         content: content.trim() === "" ? " " : content.addBrackets(),

diff --git a/src/functions/message/hasAttachment.js b/src/functions/message/hasAttachment.js
@@ -0,0 +1,17 @@
+module.exports = async (d) => {
+    const data = d.util.aoiFunc(d);
+
+    const [messageID = d.message?.id, channelID = d.channel?.id] = 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});
+
+    data.result = message.attachments.size ? true : false;
+
+    return {
+        code: d.util.setCode(data)
+    }
+}