Browse Source

Merge pull request #270 from Auxes/channel-created-fix

Fixed ChannelCreated event not triggering
tags/1.0-rc
RogueException GitHub 8 years ago
parent
commit
f9cdd3ddf6
2 changed files with 3 additions and 2 deletions
  1. +1
    -1
      src/Discord.Net/WebSocket/DiscordSocketClient.cs
  2. +2
    -1
      src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs

+ 1
- 1
src/Discord.Net/WebSocket/DiscordSocketClient.cs View File

@@ -792,7 +792,7 @@ namespace Discord.WebSocket
var guild = DataStore.GetGuild(data.GuildId.Value); var guild = DataStore.GetGuild(data.GuildId.Value);
if (guild != null) if (guild != null)
{ {
guild.AddChannel(data, DataStore);
channel = guild.AddChannel(data, DataStore);


if (!guild.IsSynced) if (!guild.IsSynced)
{ {


+ 2
- 1
src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs View File

@@ -148,11 +148,12 @@ namespace Discord.WebSocket


public override Task<IGuildChannel> GetChannelAsync(ulong id) => Task.FromResult<IGuildChannel>(GetChannel(id)); public override Task<IGuildChannel> GetChannelAsync(ulong id) => Task.FromResult<IGuildChannel>(GetChannel(id));
public override Task<IReadOnlyCollection<IGuildChannel>> GetChannelsAsync() => Task.FromResult<IReadOnlyCollection<IGuildChannel>>(Channels); public override Task<IReadOnlyCollection<IGuildChannel>> GetChannelsAsync() => Task.FromResult<IReadOnlyCollection<IGuildChannel>>(Channels);
public void AddChannel(ChannelModel model, DataStore dataStore, ConcurrentHashSet<ulong> channels = null)
public ISocketGuildChannel AddChannel(ChannelModel model, DataStore dataStore, ConcurrentHashSet<ulong> channels = null)
{ {
var channel = ToChannel(model); var channel = ToChannel(model);
(channels ?? _channels).TryAdd(model.Id); (channels ?? _channels).TryAdd(model.Id);
dataStore.AddChannel(channel); dataStore.AddChannel(channel);
return channel;
} }
public ISocketGuildChannel GetChannel(ulong id) public ISocketGuildChannel GetChannel(ulong id)
{ {


Loading…
Cancel
Save