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

Merge pull request #228 from Nitix/fix-174

Browse Source 
Fix Voice Channel being null #174
This commit is contained in:
RogueException
2016-08-25 23:29:47 -03:00
committed by GitHub
parent de4393839d 345e429d20
commit 5519cfa9fd
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Discord.Net/WebSocket/Entities/Users/SocketGuildUser.cs
View File

@@ -4,7 +4,7 @@ using PresenceModel = Discord.API.Presence;
namespace Discord.WebSocket namespace Discord.WebSocket
{ {
internal class SocketGuildUser : GuildUser, ISocketUser internal class SocketGuildUser : GuildUser, ISocketUser, IVoiceState
{ {
internal override bool IsAttached => true; internal override bool IsAttached => true;
@@ -20,7 +20,11 @@ namespace Discord.WebSocket
public bool IsSelfDeafened => VoiceState?.IsSelfDeafened ?? false; public bool IsSelfDeafened => VoiceState?.IsSelfDeafened ?? false;
public bool IsSelfMuted => VoiceState?.IsSelfMuted ?? false; public bool IsSelfMuted => VoiceState?.IsSelfMuted ?? false;
public bool IsSuppressed => VoiceState?.IsSuppressed ?? false; public bool IsSuppressed => VoiceState?.IsSuppressed ?? false;
public SocketVoiceChannel VoiceChannel => VoiceState?.VoiceChannel; public VoiceChannel VoiceChannel => VoiceState?.VoiceChannel;
public bool IsDeafened => VoiceState?.IsDeafened ?? false;
public bool IsMuted => VoiceState?.IsMuted ?? false;
public string VoiceSessionId => VoiceState?.VoiceSessionId ?? "";
IVoiceChannel IVoiceState.VoiceChannel => VoiceState?.VoiceChannel;
public SocketGuildUser(SocketGuild guild, SocketGlobalUser user, Model model) public SocketGuildUser(SocketGuild guild, SocketGlobalUser user, Model model)
: base(guild, user, model) : base(guild, user, model)