From ba4ffcc17cb821cdabfdb8556014f81fc83f2f01 Mon Sep 17 00:00:00 2001
From: Daniel Odendahl Jr <danielbodendahl@gmail.com>
Date: Mon, 1 May 2017 20:40:10 +0000
Subject: [PATCH] avatarURL

---
 commands/avataredit/3000years.js | 3 ++-
 commands/avataredit/beautiful.js | 3 ++-
 commands/avataredit/bobross.js   | 3 ++-
 commands/avataredit/rip.js       | 3 ++-
 commands/avataredit/steamcard.js | 3 ++-
 commands/avataredit/triggered.js | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/commands/avataredit/3000years.js b/commands/avataredit/3000years.js
index 4949de1d..3e36ff8f 100644
--- a/commands/avataredit/3000years.js
+++ b/commands/avataredit/3000years.js
@@ -24,7 +24,8 @@ module.exports = class YearsCommand extends Command {
             if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES')) 
                 return msg.say('This Command requires the `Attach Files` Permission.');
         const { user } = args;
-        const avatarURL = user.displayAvatarURL.replace(/(png|jpg|jpeg|gif|webp)/, 'png');
+        const avatarURL = user.avatarURL('png', 512);
+        if (!avatarURL) return msg.say('This user has no avatar.');
         let images = [];
         images.push(Jimp.read(avatarURL));
         images.push(Jimp.read('https://i.imgur.com/eScwGFS.png'));
diff --git a/commands/avataredit/beautiful.js b/commands/avataredit/beautiful.js
index 29c4316f..760507e9 100644
--- a/commands/avataredit/beautiful.js
+++ b/commands/avataredit/beautiful.js
@@ -24,7 +24,8 @@ module.exports = class BeautifulCommand extends Command {
             if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES'))
                 return msg.say('This Command requires the `Attach Files` Permission.');
         const { user } = args;
-        const avatarURL = user.displayAvatarURL.replace(/(png|jpg|jpeg|gif|webp)/, 'png');
+        const avatarURL = user.avatarURL('png', 512);
+        if (!avatarURL) return msg.say('This user has no avatar.');
         let images = [];
         images.push(Jimp.read(avatarURL));
         images.push(Jimp.read('https://i.imgur.com/OOQ9QwQ.jpg'));
diff --git a/commands/avataredit/bobross.js b/commands/avataredit/bobross.js
index f01ce286..0a501edc 100644
--- a/commands/avataredit/bobross.js
+++ b/commands/avataredit/bobross.js
@@ -24,7 +24,8 @@ module.exports = class BobRossCommand extends Command {
             if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES'))
                 return msg.say('This Command requires the `Attach Files` Permission.');
         const { user } = args;
-        const avatarURL = user.displayAvatarURL.replace(/(png|jpg|jpeg|gif|webp)/, 'png');
+        const avatarURL = user.avatarURL('png', 512);
+        if (!avatarURL) return msg.say('This user has no avatar.');
         const blank = new Jimp(600, 775, 0xFFFFFFFF);
         let images = [];
         images.push(Jimp.read(avatarURL));
diff --git a/commands/avataredit/rip.js b/commands/avataredit/rip.js
index 2bf9cb75..bf63647a 100644
--- a/commands/avataredit/rip.js
+++ b/commands/avataredit/rip.js
@@ -25,7 +25,8 @@ module.exports = class RIPCommand extends Command {
             if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES'))
                 return msg.say('This Command requires the `Attach Files` Permission.');
         const { user } = args;
-        const avatarURL = user.displayAvatarURL.replace(/(png|jpg|jpeg|gif|webp)/, 'png');
+        const avatarURL = user.avatarURL('png', 512);
+        if (!avatarURL) return msg.say('This user has no avatar.');
         let images = [];
         images.push(Jimp.read(avatarURL));
         images.push(Jimp.read('https://i.imgur.com/KriteWm.jpg'));
diff --git a/commands/avataredit/steamcard.js b/commands/avataredit/steamcard.js
index 1ce8415e..a9926769 100644
--- a/commands/avataredit/steamcard.js
+++ b/commands/avataredit/steamcard.js
@@ -25,7 +25,8 @@ module.exports = class SteamCardCommand extends Command {
                 return msg.say('This Command requires the `Attach Files` Permission.');
         const { user } = args;
         const username = msg.guild ? msg.guild.member(user).displayName : user.username;
-        const avatarURL = user.displayAvatarURL.replace(/(png|jpg|jpeg|gif|webp)/, 'png');
+        const avatarURL = user.avatarURL('png', 512);
+        if (!avatarURL) return msg.say('This user has no avatar.');
         const blank = new Jimp(494, 568, 0xFFFFFFFF);
         let images = [];
         images.push(Jimp.read(avatarURL));
diff --git a/commands/avataredit/triggered.js b/commands/avataredit/triggered.js
index 1242f5a8..46d14ec2 100644
--- a/commands/avataredit/triggered.js
+++ b/commands/avataredit/triggered.js
@@ -21,7 +21,8 @@ module.exports = class TriggeredCommand extends Command {
             if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES'))
                 return msg.say('This Command requires the `Attach Files` Permission.');
         const { user } = args;
-        const avatarURL = user.displayAvatarURL.replace(/(png|jpg|jpeg|gif|webp)/, 'png');
+        const avatarURL = user.avatarURL('png', 512);
+        if (!avatarURL) return msg.say('This user has no avatar.');
         const blank = new Jimp(320, 371, 0xFFFFFFFF);
         let images = [];
         images.push(Jimp.read(avatarURL));