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

fix more race conditions (#1740)

Browse Source 
* Update ClientUser.js

* Update ClientUserGuildSettings.js
This commit is contained in:
Gus Caplan
2017-07-31 22:42:22 -05:00
committed by Crawl
parent 4b77f26851
commit fd11381cc5
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/structures/ClientUser.js
View File

@@ -88,6 +88,7 @@ class ClientUser extends User {
this.guildSettings = new Collection(); this.guildSettings = new Collection();
if (data.user_guild_settings) { if (data.user_guild_settings) {
for (const settings of data.user_guild_settings) { for (const settings of data.user_guild_settings) {
settings.client = this.client;
const guild = this.client.guilds.get(settings.guild_id); const guild = this.client.guilds.get(settings.guild_id);
this.guildSettings.set(settings.guild_id, new ClientUserGuildSettings(settings, guild)); this.guildSettings.set(settings.guild_id, new ClientUserGuildSettings(settings, guild));
} }

3
src/structures/ClientUserGuildSettings.js
View File

@@ -8,6 +8,7 @@ const ClientUserChannelOverride = require('./ClientUserChannelOverride');
class ClientUserGuildSettings { class ClientUserGuildSettings {
constructor(data, guild) { constructor(data, guild) {
this.guild = guild; this.guild = guild;
this.client = data.client;
this.channelOverrides = new Collection(); this.channelOverrides = new Collection();
this.patch(data); this.patch(data);
} }
@@ -23,7 +24,7 @@ class ClientUserGuildSettings {
if (key === 'channel_overrides') { if (key === 'channel_overrides') {
for (const channel of data[key]) { for (const channel of data[key]) {
this.channelOverrides.set(channel.channel_id, this.channelOverrides.set(channel.channel_id,
new ClientUserChannelOverride(this.guild.client.user, channel)); new ClientUserChannelOverride(this.client.user, channel));
} }
} else if (typeof value === 'function') { } else if (typeof value === 'function') {
this[value.name] = value(data[key]); this[value.name] = value(data[key]);