fix(WebhookClient): use applyToClass instead of multiple inheritance (#…

…1896)
discordjs · Sep 6, 2017 · 694f78c · 694f78c
1 parent 2305311
commit 694f78c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/src/client/WebhookClient.js b/src/client/WebhookClient.js
@@ -14,14 +14,16 @@ class WebhookClient extends BaseClient {
    * @example
    * // Create a new webhook and send a message
    * const hook = new Discord.WebhookClient('1234', 'abcdef');
-   * hook.sendMessage('This will send a message').catch(console.error);
+   * hook.send('This will send a message').catch(console.error);
    */
   constructor(id, token, options) {
     super(options);
-    Webhook.call(this, null, id, token);
+    Object.defineProperty(this, 'client', { value: this });
+    this.id = id;
+    this.token = token;
   }
 }
 
-Object.assign(WebhookClient.prototype, Object.create(Webhook.prototype));
+Webhook.applyToClass(WebhookClient);
 
 module.exports = WebhookClient;
diff --git a/src/structures/Webhook.js b/src/structures/Webhook.js
@@ -8,21 +8,15 @@ const MessageEmbed = require('./MessageEmbed');
  * Represents a webhook.
  */
 class Webhook {
-  constructor(client, dataOrID, token) {
-    if (client) {
-      /**
-       * The client that instantiated the webhook
-       * @name Webhook#client
-       * @type {Client}
-       * @readonly
-       */
-      Object.defineProperty(this, 'client', { value: client });
-      if (dataOrID) this._patch(dataOrID);
-    } else {
-      this.id = dataOrID;
-      this.token = token;
-      Object.defineProperty(this, 'client', { value: this });
-    }
+  constructor(client, data) {
+    /**
+     * The client that instantiated the webhook
+     * @name Webhook#client
+     * @type {Client}
+     * @readonly
+     */
+    Object.defineProperty(this, 'client', { value: client });
+    if (data) this._patch(data);
   }
 
   _patch(data) {
@@ -274,6 +268,18 @@ class Webhook {
   delete(reason) {
     return this.client.api.webhooks(this.id, this.token).delete({ reason });
   }
+
+  static applyToClass(structure) {
+    for (const prop of [
+      'send',
+      'sendSlackMessage',
+      'edit',
+      'delete',
+    ]) {
+      Object.defineProperty(structure.prototype, prop,
+        Object.getOwnPropertyDescriptor(Webhook.prototype, prop));
+    }
+  }
 }
 
 module.exports = Webhook;