github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged changed from dev branch

Browse Source
This commit is contained in:
RogueException
2016-09-22 21:31:48 -03:00
parent 6319933ed0 1d24bc7808
commit 683f0d5013
19 changed files with 167 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
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<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);
(channels ?? _channels).TryAdd(model.Id);
dataStore.AddChannel(channel);
return channel;
}
public ISocketGuildChannel GetChannel(ulong id)
{