dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-06-07 16:52:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats 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); * .catch(console.error);
*/ */
createEmoji(attachment, name) { createEmoji(attachment, name) {
return this.client.resolver.resolveBuffer(attachment).then(file => { return new Promise(resolve => {
let base64 = new Buffer(file, 'binary').toString('base64'); if (attachment.startsWith('data:')) {
let dataURI = `data:;base64,${base64}`; resolve(this.client.rest.methods.createEmoji(this, attachment, name));
return this.client.rest.methods.createEmoji(this, dataURI, 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) * .catch(console.error)
*/ */
createWebhook(name, avatar) { createWebhook(name, avatar) {
if (avatar) { return new Promise(resolve => {
return this.client.resolver.resolveBuffer(avatar).then(file => { if (avatar.startsWith('data:')) {
let base64 = new Buffer(file, 'binary').toString('base64'); resolve(this.client.rest.methods.createWebhook(this, name, avatar));
let dataURI = `data:;base64,${base64}`; } else {
return this.client.rest.methods.createWebhook(this, name, dataURI); this.client.resolver.resolveBuffer(avatar).then(data =>
}); resolve(this.client.rest.methods.createWebhook(this, name, data))
} );
return this.client.rest.methods.createWebhook(this, name); }
});
} }
// These are here only for documentation purposes - they are implemented by TextBasedChannel // These are here only for documentation purposes - they are implemented by TextBasedChannel