image v1.2.1

Author: barnabwhy

modules/commands.js

@@ -17,17 +17,17 @@ let { findImage, sendImage } = require("./utils");
 const { parseMsg, isCmd } = require("./parse");
 
 let runMusicCmd;
-if(process.env.MUSIC_ENABLED == "true") {
-    runMusicCmd = require("@frogebot/music")({
-      BOT_NAME: process.env.BOT_NAME,
-      EMBED_COLOUR: process.env.EMBED_COLOUR,
-      MSG_VIBING: process.env.MSG_VIBING,
-      MSG_UNVIBING: process.env.MSG_UNVIBING,
-      SKIP_PERCENT: process.env.SKIP_PERCENT,
-      USE_MUSIC_ROLE: process.env.USE_MUSIC_ROLE,
-      MUSIC_ROLE_NAME: process.env.MUSIC_ROLE_NAME,
-      TOKEN: process.env.TOKEN
-    })
+if (process.env.MUSIC_ENABLED == "true") {
+  runMusicCmd = require("@frogebot/music")({
+    BOT_NAME: process.env.BOT_NAME,
+    EMBED_COLOUR: process.env.EMBED_COLOUR,
+    MSG_VIBING: process.env.MSG_VIBING,
+    MSG_UNVIBING: process.env.MSG_UNVIBING,
+    SKIP_PERCENT: process.env.SKIP_PERCENT,
+    USE_MUSIC_ROLE: process.env.USE_MUSIC_ROLE,
+    MUSIC_ROLE_NAME: process.env.MUSIC_ROLE_NAME,
+    TOKEN: process.env.TOKEN,
+  });
 }
 
 async function handleCmdMsg(msg) {
@@ -41,12 +41,20 @@ async function handleCmdMsg(msg) {
   handleCmd(msg, cmd, args);
 }
 async function handleCmdInteraction(interaction) {
-  if(interaction.isCommand()) {
+  if (interaction.isCommand()) {
     let cmd = commands[interaction.commandName];
-    let args = cmd.options ? cmd.options.map(o => { if(interaction.options.get(o.name)) { return interaction.options.get(o.name).value } else { return undefined } }) : []
+    let args = cmd.options
+      ? cmd.options.map((o) => {
+          if (interaction.options.get(o.name)) {
+            return interaction.options.get(o.name).value;
+          } else {
+            return undefined;
+          }
+        })
+      : [];
     handleCmd(interaction, cmd, args);
   }
-  if(interaction.isContextMenu()) {
+  if (interaction.isContextMenu()) {
     let cmd = commands[interaction.commandName];
     let args = [interaction.targetId];
     handleCmd(interaction, cmd, args);
@@ -57,7 +65,8 @@ async function handleCmd(interaction, cmd, args) {
   let startTime = new Date().getTime();
   cmdUses += 1;
 
-  if (cmd.type == "script") { // If command is set as script type
+  if (cmd.type == "script") {
+    // If command is set as script type
     // Debug clear cache
     // delete require.cache[require.resolve("../" + cmd.path)];
 
@@ -69,7 +78,10 @@ async function handleCmd(interaction, cmd, args) {
     // If command is set as image type
     let imageUrl = await findImage(interaction); // Find image in channel
     try {
-      let procMsg = await interaction.reply({ content: process.env.MSG_PROCESSING, fetchReply: true });
+      let procMsg = await interaction.reply({
+        content: process.env.MSG_PROCESSING,
+        fetchReply: true,
+      });
       // msg.channel.startTyping();
 
       let r;
@@ -125,8 +137,10 @@ async function handleCmd(interaction, cmd, args) {
       // Execute command
       let img;
       if (cmd.library == "jimp") img = await exec(imageUrl, list, interaction);
-      if (cmd.library == "magick") img = await execGM(imageUrl, list, interaction);
-      if (cmd.library == "native") img = await execGPU(imageUrl, list, interaction);
+      if (cmd.library == "magick")
+        img = await execGM(imageUrl, list, interaction);
+      if (cmd.library == "native")
+        img = await execGPU(imageUrl, list, interaction);
 
       let extension = await getFormat(imageUrl);
 
@@ -139,30 +153,31 @@ async function handleCmd(interaction, cmd, args) {
       // procMsg.delete();
       interaction.editReply({
         content: `${process.env.MSG_UNVIBING} An error occurred`,
-        embeds: [{
-          title: "Error",
-          description: `<@${interaction.member.id}> - ${
-            imageUrl != undefined
-              ? process.env.MSG_ERROR
-              : process.env.MSG_NO_IMAGE
-          }\n${ "```"+e+"```" }`,
-          color: Number(process.env.EMBED_COLOUR),
-          timestamp: new Date(),
-          author: {
-            name: process.env.BOT_NAME,
-            icon_url: interaction.client.user.displayAvatarURL(),
+        embeds: [
+          {
+            title: "Error",
+            description: `<@${interaction.member.id}> - ${
+              imageUrl != undefined
+                ? process.env.MSG_ERROR
+                : process.env.MSG_NO_IMAGE
+            }\n${"```" + e + "```"}`,
+            color: Number(process.env.EMBED_COLOUR),
+            timestamp: new Date(),
+            author: {
+              name: process.env.BOT_NAME,
+              icon_url: interaction.client.user.displayAvatarURL(),
+            },
           },
-        }],
+        ],
       });
     }
   } else if (cmd.type == "music" && process.env.MUSIC_ENABLED == "true") {
     // If command is set as music type
-    runMusicCmd(msg, args, cmd)
+    runMusicCmd(msg, args, cmd);
   }
 }
 
-
 module.exports = {
   handleCmdMsg,
-  handleCmdInteraction
+  handleCmdInteraction,
 };