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

Merge branch 'master' into voice-rewrite

Browse Source
This commit is contained in:
iCrawl
2018-01-15 04:45:48 +01:00
parent 83640a2640 42c0e50c92
commit f61b57ce10
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sharding/ShardClientUtil.js
View File

@@ -86,7 +86,7 @@ class ShardClientUtil {
*/ */
broadcastEval(script) { broadcastEval(script) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
script = typeof script !== 'function' ? `(${script})(this)` : script; script = typeof script === 'function' ? `(${script})(this)` : script;
const listener = message => { const listener = message => {
if (!message || message._sEval !== script) return; if (!message || message._sEval !== script) return;
process.removeListener('message', listener); process.removeListener('message', listener);

2
src/structures/Guild.js
View File

@@ -40,7 +40,7 @@ class Guild extends Base {
/** /**
* A collection of roles that are in this guild. The key is the role's ID, the value is the role * A collection of roles that are in this guild. The key is the role's ID, the value is the role
* @type {Collection<Snowflake, Role>} * @type {RoleStore<Snowflake, Role>}
*/ */
this.roles = new RoleStore(this); this.roles = new RoleStore(this);

8
src/structures/MessageEmbed.js
View File

@@ -67,8 +67,8 @@ class MessageEmbed {
this.thumbnail = data.thumbnail ? { this.thumbnail = data.thumbnail ? {
url: data.thumbnail.url, url: data.thumbnail.url,
proxyURL: data.thumbnail.proxy_url, proxyURL: data.thumbnail.proxy_url,
height: data.height, height: data.thumbnail.height,
width: data.width, width: data.thumbnail.width,
} : null; } : null;
/** /**
@@ -82,8 +82,8 @@ class MessageEmbed {
this.image = data.image ? { this.image = data.image ? {
url: data.image.url, url: data.image.url,
proxyURL: data.image.proxy_url, proxyURL: data.image.proxy_url,
height: data.height, height: data.image.height,
width: data.width, width: data.image.width,
} : null; } : null;
/** /**