Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-09 16:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix these things (#895)

Browse Source 
* fix these things

* fix enormous stupid
This commit is contained in:
Gus Caplan
2016-11-13 01:05:55 -06:00
committed by Schuyler Cebulskie
parent bb3b709d6e
commit c041b1bc23
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/structures/Guild.js
View File

@@ -598,10 +598,14 @@ class Guild {
* .catch(console.error);
*/
createEmoji(attachment, name) {
return this.client.resolver.resolveBuffer(attachment).then(file => {
let base64 = new Buffer(file, 'binary').toString('base64');
let dataURI = `data:;base64,${base64}`;
return this.client.rest.methods.createEmoji(this, dataURI, name);
return new Promise(resolve => {
if (attachment.startsWith('data:')) {
resolve(this.client.rest.methods.createEmoji(this, attachment, name));
} else {
this.client.resolver.resolveBuffer(attachment).then(data =>
resolve(this.client.rest.methods.createEmoji(this, data, name))
);
}
});
}

17
src/structures/TextChannel.js
View File

@@ -61,14 +61,15 @@ class TextChannel extends GuildChannel {
* .catch(console.error)
*/
createWebhook(name, avatar) {
if (avatar) {
return this.client.resolver.resolveBuffer(avatar).then(file => {
let base64 = new Buffer(file, 'binary').toString('base64');
let dataURI = `data:;base64,${base64}`;
return this.client.rest.methods.createWebhook(this, name, dataURI);
});
}
return this.client.rest.methods.createWebhook(this, name);
return new Promise(resolve => {
if (avatar.startsWith('data:')) {
resolve(this.client.rest.methods.createWebhook(this, name, avatar));
} else {
this.client.resolver.resolveBuffer(avatar).then(data =>
resolve(this.client.rest.methods.createWebhook(this, name, data))
);
}
});
}
// These are here only for documentation purposes - they are implemented by TextBasedChannel