From a9d29cdec440f50c3c4b0438988f5d50a8888f8d Mon Sep 17 00:00:00 2001
From: Daniel Odendahl Jr <danielbodendahl@gmail.com>
Date: Tue, 2 May 2017 11:18:51 +0000
Subject: [PATCH] Bug Catching in File Commands

---
 commands/avataredit/3000years.js | 3 ++-
 commands/avataredit/beautiful.js | 3 ++-
 commands/avataredit/bobross.js   | 3 ++-
 commands/avataredit/greyscale.js | 3 ++-
 commands/avataredit/invert.js    | 3 ++-
 commands/avataredit/rip.js       | 3 ++-
 commands/avataredit/steamcard.js | 3 ++-
 commands/avataredit/triggered.js | 3 ++-
 commands/avataredit/wanted.js    | 3 ++-
 commands/random/spam.js          | 3 ++-
 commands/randomimg/cat.js        | 3 ++-
 commands/randomimg/dog.js        | 3 ++-
 commands/randomimg/xiaopai.js    | 3 ++-
 commands/search/map.js           | 3 ++-
 package.json                     | 2 +-
 15 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/commands/avataredit/3000years.js b/commands/avataredit/3000years.js
index b37b5a57..239304ce 100644
--- a/commands/avataredit/3000years.js
+++ b/commands/avataredit/3000years.js
@@ -34,7 +34,8 @@ module.exports = class YearsCommand extends Command {
         az.composite(avatar, 461, 127);
         az.getBuffer(Jimp.MIME_PNG, (err, buff) => {
             if (err) return msg.say('An Unknown Error Occurred.');
-            return msg.channel.send({files: [{attachment: buff}]});
+            return msg.channel.send({files: [{attachment: buff}]})
+                .catch(() => msg.say('An Unknown Error Occurred.'));
         });
     }
 };
diff --git a/commands/avataredit/beautiful.js b/commands/avataredit/beautiful.js
index f86d16b0..c30a1f7b 100644
--- a/commands/avataredit/beautiful.js
+++ b/commands/avataredit/beautiful.js
@@ -35,7 +35,8 @@ module.exports = class BeautifulCommand extends Command {
         grunkle.composite(avatar, 342, 301);
         grunkle.getBuffer(Jimp.MIME_PNG, (err, buff) => {
             if (err) return msg.say('An Unknown Error Occurred.');
-            return msg.channel.send({files: [{attachment: buff}]});
+            return msg.channel.send({files: [{attachment: buff}]})
+                .catch(() => msg.say('An Unknown Error Occurred.'));
         });
     }
 };
diff --git a/commands/avataredit/bobross.js b/commands/avataredit/bobross.js
index 842421a7..11bb9ab2 100644
--- a/commands/avataredit/bobross.js
+++ b/commands/avataredit/bobross.js
@@ -37,7 +37,8 @@ module.exports = class BobRossCommand extends Command {
         blank.composite(bob, 0, 0);
         blank.getBuffer(Jimp.MIME_PNG, (err, buff) => {
             if (err) return msg.say('An Unknown Error Occurred.');
-            return msg.channel.send({files: [{attachment: buff}]});
+            return msg.channel.send({files: [{attachment: buff}]})
+                .catch(() => msg.say('An Unknown Error Occurred.'));
         });
     }
 };
diff --git a/commands/avataredit/greyscale.js b/commands/avataredit/greyscale.js
index 25769bb9..4837b85e 100644
--- a/commands/avataredit/greyscale.js
+++ b/commands/avataredit/greyscale.js
@@ -27,7 +27,8 @@ module.exports = class GreyscaleCommand extends Command {
         avatar.greyscale();
         avatar.getBuffer(Jimp.MIME_PNG, (err, buff) => {
             if (err) return msg.say('An Unknown Error Occurred.');
-            return msg.channel.send({files: [{attachment: buff}]});
+            return msg.channel.send({files: [{attachment: buff}]})
+                .catch(() => msg.say('An Unknown Error Occurred.'));
         });
     }
 };
diff --git a/commands/avataredit/invert.js b/commands/avataredit/invert.js
index 5c22508a..db63ecb5 100644
--- a/commands/avataredit/invert.js
+++ b/commands/avataredit/invert.js
@@ -27,7 +27,8 @@ module.exports = class InvertCommand extends Command {
         avatar.invert();
         avatar.getBuffer(Jimp.MIME_PNG, (err, buff) => {
             if (err) return msg.say('An Unknown Error Occurred.');
-            return msg.channel.send({files: [{attachment: buff}]});
+            return msg.channel.send({files: [{attachment: buff}]})
+                .catch(() => msg.say('An Unknown Error Occurred.'));
         });
     }
 };
diff --git a/commands/avataredit/rip.js b/commands/avataredit/rip.js
index 2d33921a..9f1fa106 100644
--- a/commands/avataredit/rip.js
+++ b/commands/avataredit/rip.js
@@ -36,7 +36,8 @@ module.exports = class RIPCommand extends Command {
         grave.composite(avatar, 158, 51);
         grave.getBuffer(Jimp.MIME_PNG, (err, buff) => {
             if (err) return msg.say('An Unknown Error Occurred.');
-            return msg.channel.send({files: [{attachment: buff}]});
+            return msg.channel.send({files: [{attachment: buff}]})
+                .catch(() => msg.say('An Unknown Error Occurred.'));
         });
     }
 };
diff --git a/commands/avataredit/steamcard.js b/commands/avataredit/steamcard.js
index cc12da61..c0f0524a 100644
--- a/commands/avataredit/steamcard.js
+++ b/commands/avataredit/steamcard.js
@@ -39,7 +39,8 @@ module.exports = class SteamCardCommand extends Command {
         blank.print(font, 38, 20, username);
         blank.getBuffer(Jimp.MIME_PNG, (err, buff) => {
             if (err) return msg.say('An Unknown Error Occurred.');
-            return msg.channel.send({files: [{attachment: buff}]});
+            return msg.channel.send({files: [{attachment: buff}]})
+                .catch(() => msg.say('An Unknown Error Occurred.'));
         });
     }
 };
diff --git a/commands/avataredit/triggered.js b/commands/avataredit/triggered.js
index 58725f76..ed82a11e 100644
--- a/commands/avataredit/triggered.js
+++ b/commands/avataredit/triggered.js
@@ -33,7 +33,8 @@ module.exports = class TriggeredCommand extends Command {
         blank.composite(triggered, 0, 0);
         blank.getBuffer(Jimp.MIME_PNG, (err, buff) => {
             if (err) return msg.say('An Unknown Error Occurred.');
-            return msg.channel.send({files: [{attachment: buff}]});
+            return msg.channel.send({files: [{attachment: buff}]})
+                .catch(() => msg.say('An Unknown Error Occurred.'));
         });
     }
 };
diff --git a/commands/avataredit/wanted.js b/commands/avataredit/wanted.js
index 779a6038..e11b3000 100644
--- a/commands/avataredit/wanted.js
+++ b/commands/avataredit/wanted.js
@@ -31,7 +31,8 @@ module.exports = class WantedCommand extends Command {
         wanted.composite(avatar, 189, 438);
         wanted.getBuffer(Jimp.MIME_PNG, (err, buff) => {
             if (err) return msg.say('An Unknown Error Occurred.');
-            return msg.channel.send({files: [{attachment: buff}]});
+            return msg.channel.send({files: [{attachment: buff}]})
+                .catch(() => msg.say('An Unknown Error Occurred.'));
         });
     }
 };
diff --git a/commands/random/spam.js b/commands/random/spam.js
index 2ea149ce..2249021a 100644
--- a/commands/random/spam.js
+++ b/commands/random/spam.js
@@ -14,6 +14,7 @@ module.exports = class SpamCommand extends Command {
         if (msg.channel.type !== 'dm')
             if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES'))
                 return msg.say('This Command requires the `Attach Files` Permission.');
-        return msg.channel.send({files: ['https://i.imgur.com/2JFu5xE.jpg']});
+        return msg.channel.send({files: ['https://i.imgur.com/2JFu5xE.jpg']})
+            .catch(() => msg.say('An Unknown Error Occurred.'));
     }
 };
diff --git a/commands/randomimg/cat.js b/commands/randomimg/cat.js
index 763108d9..b586ec60 100644
--- a/commands/randomimg/cat.js
+++ b/commands/randomimg/cat.js
@@ -21,7 +21,8 @@ module.exports = class CatCommand extends Command {
         try {
             const { body } = await request
                 .get('http://random.cat/meow');
-            return msg.channel.send({files: [body.file]});
+            return msg.channel.send({files: [body.file]})
+                .catch(() => msg.say('An Unknown Error Occurred.'));
         } catch (err) {
             return msg.say('An Unknown Error Occurred.');
         }
diff --git a/commands/randomimg/dog.js b/commands/randomimg/dog.js
index a4932ac2..01cee3dc 100644
--- a/commands/randomimg/dog.js
+++ b/commands/randomimg/dog.js
@@ -18,7 +18,8 @@ module.exports = class DogCommand extends Command {
         try {
             const { body } = await request
                 .get('https://random.dog/woof.json');
-            return msg.channel.send({files: [body.url]});
+            return msg.channel.send({files: [body.url]})
+                .catch(() => msg.say('An Unknown Error Occurred.'));
         } catch (err) {
             return msg.say('An Unknown Error Occurred.');
         }
diff --git a/commands/randomimg/xiaopai.js b/commands/randomimg/xiaopai.js
index be682cac..09d94ac6 100644
--- a/commands/randomimg/xiaopai.js
+++ b/commands/randomimg/xiaopai.js
@@ -19,6 +19,7 @@ module.exports = class XiaoCommand extends Command {
             if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES'))
                 return msg.say('This Command requires the `Attach Files` Permission.');
         const xiao = xiaos[Math.floor(Math.random() * xiaos.length)];
-        return msg.channel.send({files: [xiao]});
+        return msg.channel.send({files: [xiao]})
+            .catch(() => msg.say('An Unknown Error Occurred.'));
     }
 };
diff --git a/commands/search/map.js b/commands/search/map.js
index 8b15ad35..419f9355 100644
--- a/commands/search/map.js
+++ b/commands/search/map.js
@@ -34,7 +34,8 @@ module.exports = class MapCommand extends Command {
         try {
             const { body } = await request
                 .get(`https://maps.googleapis.com/maps/api/staticmap?center=${query}&zoom=${zoom}&size=500x500&key=${process.env.GOOGLE_KEY}`);
-            return msg.channel.send({files: [{attachment: body}]});
+            return msg.channel.send({files: [{attachment: body}]})
+                .catch(() => msg.say('An Unknown Error Occurred.'));
         } catch (err) {
             return msg.say('An Error Occurred. The location may not have been found.');
         }
diff --git a/package.json b/package.json
index 86e49e5e..433cc5c6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xiaobot",
-  "version": "17.2.0",
+  "version": "17.2.1",
   "description": "A Discord Bot",
   "main": "shardingmanager.js",
   "scripts": {