Clean up a bunch of promise stuff

src/structures/Message.js

@@ -438,13 +438,15 @@ class Message {
    *  .catch(console.error);
    */
   delete(timeout = 0) {
-    return new Promise((resolve, reject) => {
-      this.client.setTimeout(() => {
-        this.client.rest.methods.deleteMessage(this)
-          .then(resolve)
-          .catch(reject);
-      }, timeout);
-    });
+    if (timeout <= 0) {
+      return this.client.rest.methods.deleteMessage(this);
+    } else {
+      return new Promise(resolve => {
+        this.client.setTimeout(() => {
+          resolve(this.delete());
+        }, timeout);
+      });
+    }
   }
 
   /**

src/structures/MessageReaction.js

@@ -123,16 +123,15 @@ class MessageReaction {
     const message = this.message;
     return new Promise((resolve, reject) => {
       message.client.rest.methods.getMessageReactionUsers(message.channel.id, message.id, this.emoji.identifier, limit)
-      .then(users => {
-        this.users = new Collection();
-        for (const rawUser of users) {
-          const user = this.message.client.dataManager.newUser(rawUser);
-          this.users.set(user.id, user);
-        }
-        this.count = this.users.size;
-        resolve(this.users);
-      })
-      .catch(reject);
+        .then(users => {
+          this.users = new Collection();
+          for (const rawUser of users) {
+            const user = this.message.client.dataManager.newUser(rawUser);
+            this.users.set(user.id, user);
+          }
+          this.count = this.users.size;
+          resolve(this.users);
+        }, reject);
     });
   }
 }

src/structures/TextChannel.js

@@ -66,10 +66,10 @@ class TextChannel extends GuildChannel {
         this.client.resolver.resolveFile(avatar).then(file => {
           let base64 = new Buffer(file, 'binary').toString('base64');
           let dataURI = `data:;base64,${base64}`;
-          this.client.rest.methods.createWebhook(this, name, dataURI).then(resolve).catch(reject);
-        }).catch(reject);
+          resolve(this.client.rest.methods.createWebhook(this, name, dataURI));
+        }, reject);
       } else {
-        this.client.rest.methods.createWebhook(this, name).then(resolve).catch(reject);
+        resolve(this.client.rest.methods.createWebhook(this, name));
       }
     });
   }

src/structures/Webhook.js

@@ -145,11 +145,11 @@ class Webhook {
     }
     return new Promise((resolve, reject) => {
       this.client.resolver.resolveFile(attachment).then(file => {
-        this.client.rest.methods.sendWebhookMessage(this, content, options, {
+        resolve(this.client.rest.methods.sendWebhookMessage(this, content, options, {
           file,
           name: fileName,
-        }).then(resolve).catch(reject);
-      }).catch(reject);
+        }));
+      }, reject);
     });
   }
 
@@ -181,14 +181,13 @@ class Webhook {
       if (avatar) {
         this.client.resolver.resolveFile(avatar).then(file => {
           const dataURI = this.client.resolver.resolveBase64(file);
-          this.client.rest.methods.editWebhook(this, name, dataURI)
-          .then(resolve).catch(reject);
-        }).catch(reject);
+          resolve(this.client.rest.methods.editWebhook(this, name, dataURI));
+        }, reject);
       } else {
-        this.client.rest.methods.editWebhook(this, name)
-        .then(data => {
+        this.client.rest.methods.editWebhook(this, name).then(data => {
           this.setup(data);
-        }).catch(reject);
+          resolve(this);
+        }, reject);
       }
     });
   }

src/structures/interface/TextBasedChannel.js

@@ -97,8 +97,8 @@ class TextBasedChannel {
         this.client.rest.methods.sendMessage(this, content, options, {
           file,
           name: fileName,
-        }).then(resolve).catch(reject);
-      }).catch(reject);
+        }).then(resolve, reject);
+      }, reject);
     });
   }
 
@@ -138,7 +138,7 @@ class TextBasedChannel {
 
         this._cacheMessage(msg);
         resolve(msg);
-      }).catch(reject);
+      }, reject);
     });
   }
 
@@ -172,7 +172,7 @@ class TextBasedChannel {
           this._cacheMessage(msg);
         }
         resolve(messages);
-      }).catch(reject);
+      }, reject);
     });
   }
 
@@ -190,7 +190,7 @@ class TextBasedChannel {
           this._cacheMessage(msg);
         }
         resolve(messages);
-      }).catch(reject);
+      }, reject);
     });
   }