From 169b09aadd5ea29faa35abe0fc90b0bd51ed2815 Mon Sep 17 00:00:00 2001 From: Auxe Date: Mon, 5 Sep 2016 19:14:55 -0500 Subject: [PATCH 1/3] Fixed channel being null --- src/Discord.Net/WebSocket/DiscordSocketClient.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Discord.Net/WebSocket/DiscordSocketClient.cs b/src/Discord.Net/WebSocket/DiscordSocketClient.cs index a77110c66..f7344c012 100644 --- a/src/Discord.Net/WebSocket/DiscordSocketClient.cs +++ b/src/Discord.Net/WebSocket/DiscordSocketClient.cs @@ -793,6 +793,7 @@ namespace Discord.WebSocket if (guild != null) { guild.AddChannel(data, DataStore); + channel = DataStore.GetChannel(data.Id); if (!guild.IsSynced) { From 4919c8f5914434dff866f97a2a26f1293eaf6db1 Mon Sep 17 00:00:00 2001 From: Auxe Date: Mon, 5 Sep 2016 19:32:58 -0500 Subject: [PATCH 2/3] Made the requested changes --- src/Discord.Net/WebSocket/DiscordSocketClient.cs | 2 +- src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Discord.Net/WebSocket/DiscordSocketClient.cs b/src/Discord.Net/WebSocket/DiscordSocketClient.cs index f7344c012..5d5d87ebd 100644 --- a/src/Discord.Net/WebSocket/DiscordSocketClient.cs +++ b/src/Discord.Net/WebSocket/DiscordSocketClient.cs @@ -793,7 +793,7 @@ namespace Discord.WebSocket if (guild != null) { guild.AddChannel(data, DataStore); - channel = DataStore.GetChannel(data.Id); + channel = guild.AddChannel(data, DataStore); if (!guild.IsSynced) { diff --git a/src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs b/src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs index ea0eb07a9..75f8fded2 100644 --- a/src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs +++ b/src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs @@ -148,11 +148,12 @@ namespace Discord.WebSocket public override Task GetChannelAsync(ulong id) => Task.FromResult(GetChannel(id)); public override Task> GetChannelsAsync() => Task.FromResult>(Channels); - public void AddChannel(ChannelModel model, DataStore dataStore, ConcurrentHashSet channels = null) + public ISocketGuildChannel AddChannel(ChannelModel model, DataStore dataStore, ConcurrentHashSet channels = null) { var channel = ToChannel(model); (channels ?? _channels).TryAdd(model.Id); dataStore.AddChannel(channel); + return channel; } public ISocketGuildChannel GetChannel(ulong id) { From 9f9a65135d6a74389e79d2edf1ab911e6e250cbe Mon Sep 17 00:00:00 2001 From: Auxe Date: Mon, 5 Sep 2016 19:37:31 -0500 Subject: [PATCH 3/3] Removed a duplicate statement --- src/Discord.Net/WebSocket/DiscordSocketClient.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Discord.Net/WebSocket/DiscordSocketClient.cs b/src/Discord.Net/WebSocket/DiscordSocketClient.cs index 5d5d87ebd..fec02d465 100644 --- a/src/Discord.Net/WebSocket/DiscordSocketClient.cs +++ b/src/Discord.Net/WebSocket/DiscordSocketClient.cs @@ -792,7 +792,6 @@ namespace Discord.WebSocket var guild = DataStore.GetGuild(data.GuildId.Value); if (guild != null) { - guild.AddChannel(data, DataStore); channel = guild.AddChannel(data, DataStore); if (!guild.IsSynced)