From c4fecf6609c46b3d4f56d64048708790a33c774f Mon Sep 17 00:00:00 2001
From: SpaceEEC <wermail2002-kap@yahoo.de>
Date: Mon, 28 Aug 2017 00:11:19 +0200
Subject: [PATCH] Simplified image resolving and used an options object when
 creating webhooks (#1843)

---
 src/structures/ClientUser.js  |  6 +++---
 src/structures/Guild.js       |  7 ++-----
 src/structures/TextChannel.js | 12 ++++++------
 src/structures/Webhook.js     |  7 +++----
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/structures/ClientUser.js b/src/structures/ClientUser.js
index 4ea3dcee3..289fd8203 100644
--- a/src/structures/ClientUser.js
+++ b/src/structures/ClientUser.js
@@ -341,10 +341,10 @@ class ClientUser extends User {
             return undefined;
           }, reject)
       );
-    } else {
-      return this.client.resolver.resolveFile(icon)
-        .then(data => this.createGuild(name, { region, icon: this.client.resolver.resolveBase64(data) || null }));
     }
+
+    return this.client.resolver.resolveImage(icon)
+      .then(data => this.createGuild(name, { region, icon: data || null }));
   }
 
   /**
diff --git a/src/structures/Guild.js b/src/structures/Guild.js
index 682825f89..765cd45c8 100644
--- a/src/structures/Guild.js
+++ b/src/structures/Guild.js
@@ -1044,11 +1044,8 @@ class Guild extends Base {
         .then(emoji => this.client.actions.GuildEmojiCreate.handle(this, emoji).emoji);
     }
 
-    return this.client.resolver.resolveFile(attachment)
-      .then(data => {
-        const dataURI = this.client.resolver.resolveBase64(data);
-        return this.createEmoji(dataURI, name, { roles, reason });
-      });
+    return this.client.resolver.resolveImage(attachment)
+      .then(image => this.createEmoji(image, name, { roles, reason }));
   }
 
   /**
diff --git a/src/structures/TextChannel.js b/src/structures/TextChannel.js
index 6e6b44511..8e5400777 100644
--- a/src/structures/TextChannel.js
+++ b/src/structures/TextChannel.js
@@ -51,23 +51,23 @@ class TextChannel extends GuildChannel {
   /**
    * Create a webhook for the channel.
    * @param {string} name The name of the webhook
-   * @param {BufferResolvable|Base64Resolvable} avatar The avatar for the webhook
-   * @param {string} [reason] Reason for creating this webhook
+   * @param {Object} [options] Options for creating the webhook
+   * @param {BufferResolvable|Base64Resolvable} [options.avatar] Avatar for the webhook
+   * @param {string} [options.reason] Reason for creating the webhook
    * @returns {Promise<Webhook>} webhook The created webhook
    * @example
    * channel.createWebhook('Snek', 'https://i.imgur.com/mI8XcpG.jpg')
    *   .then(webhook => console.log(`Created webhook ${webhook}`))
    *   .catch(console.error)
    */
-  createWebhook(name, avatar, reason) {
+  createWebhook(name, { avatar, reason } = {}) {
     if (typeof avatar === 'string' && avatar.startsWith('data:')) {
       return this.client.api.channels[this.id].webhooks.post({ data: {
         name, avatar,
       }, reason }).then(data => new Webhook(this.client, data));
-    } else {
-      return this.client.resolver.resolveFile(avatar).then(data =>
-        this.createWebhook(name, this.client.resolver.resolveBase64(data) || null));
     }
+    return this.client.resolver.resolveImage(avatar).then(image =>
+      this.createWebhook(name, { avatar: image, reason }));
   }
 
   // These are here only for documentation purposes - they are implemented by TextBasedChannel
diff --git a/src/structures/Webhook.js b/src/structures/Webhook.js
index 770ec0dbd..f4f30c2bf 100644
--- a/src/structures/Webhook.js
+++ b/src/structures/Webhook.js
@@ -254,10 +254,9 @@ class Webhook {
    */
   edit({ name = this.name, avatar }, reason) {
     if (avatar && (typeof avatar === 'string' && !avatar.startsWith('data:'))) {
-      return this.client.resolver.resolveFile(avatar).then(file => {
-        const dataURI = this.client.resolver.resolveBase64(file);
-        return this.edit({ name, avatar: dataURI }, reason);
-      });
+      return this.client.resolver.resolveImage(avatar).then(image =>
+        this.edit({ name, avatar: image }, reason)
+      );
     }
     return this.client.api.webhooks(this.id, this.token).patch({
       data: { name, avatar },