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

Renamed Mute/Deaf to ServerMute/ServerDeaf

Browse Source
This commit is contained in:
RogueException
2015-10-18 03:10:45 -03:00
parent cc08046acd
commit d0722b457c
2 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Discord.Net/API/Common.cs
View File

@@ -32,10 +32,20 @@ namespace Discord.API
{ {
[JsonProperty("user_id")] [JsonProperty("user_id")]
public string UserId; public string UserId;
[JsonProperty("user")]
public UserReference User;
[JsonProperty("guild_id")] [JsonProperty("guild_id")]
public string GuildId; public string GuildId;
[JsonProperty("user")]
private UserReference _user;
public UserReference User
{
get { return _user; }
set
{
_user = value;
UserId = User.Id;
}
}
} }
public class MemberInfo : MemberReference public class MemberInfo : MemberReference
{ {
@@ -47,9 +57,9 @@ namespace Discord.API
public class ExtendedMemberInfo : MemberInfo public class ExtendedMemberInfo : MemberInfo
{ {
[JsonProperty("mute")] [JsonProperty("mute")]
public bool? IsMuted; public bool? IsServerMuted;
[JsonProperty("deaf")] [JsonProperty("deaf")]
public bool? IsDeafened; public bool? IsServerDeafened;
} }
public class PresenceMemberInfo : MemberReference public class PresenceMemberInfo : MemberReference
{ {
@@ -62,20 +72,21 @@ namespace Discord.API
{ {
[JsonProperty("channel_id")] [JsonProperty("channel_id")]
public string ChannelId; public string ChannelId;
[JsonProperty("suppress")]
public bool? IsSuppressed;
[JsonProperty("session_id")] [JsonProperty("session_id")]
public string SessionId; public string SessionId;
[JsonProperty("token")]
public string Token;
[JsonProperty("self_mute")] [JsonProperty("self_mute")]
public bool? IsSelfMuted; public bool? IsSelfMuted;
[JsonProperty("self_deaf")] [JsonProperty("self_deaf")]
public bool? IsSelfDeafened; public bool? IsSelfDeafened;
[JsonProperty("mute")] [JsonProperty("mute")]
public bool? IsMuted; public bool? IsServerMuted;
[JsonProperty("deaf")] [JsonProperty("deaf")]
public bool? IsDeafened; public bool? IsServerDeafened;
[JsonProperty("token")] [JsonProperty("suppress")]
public string Token; public bool? IsServerSuppressed;
} }
//Channels //Channels

26
src/Discord.Net/Models/Member.cs
View File

@@ -22,11 +22,11 @@ namespace Discord
/// <summary> Returns the datetime that this user joined this server. </summary> /// <summary> Returns the datetime that this user joined this server. </summary>
public DateTime JoinedAt { get; private set; } public DateTime JoinedAt { get; private set; }
public bool IsMuted { get; private set; }
public bool IsDeafened { get; private set; }
public bool IsSelfMuted { get; private set; } public bool IsSelfMuted { get; private set; }
public bool IsSelfDeafened { get; private set; } public bool IsSelfDeafened { get; private set; }
public bool IsSuppressed { get; private set; } public bool IsServerMuted { get; private set; }
public bool IsServerDeafened { get; private set; }
public bool IsServerSuppressed { get; private set; }
public bool IsSpeaking { get; internal set; } public bool IsSpeaking { get; internal set; }
public string SessionId { get; private set; } public string SessionId { get; private set; }
@@ -105,10 +105,10 @@ namespace Discord
internal void Update(API.ExtendedMemberInfo model) internal void Update(API.ExtendedMemberInfo model)
{ {
Update(model as API.MemberInfo); Update(model as API.MemberInfo);
if (model.IsDeafened != null) if (model.IsServerDeafened != null)
IsDeafened = model.IsDeafened.Value; IsServerDeafened = model.IsServerDeafened.Value;
if (model.IsMuted != null) if (model.IsServerMuted != null)
IsMuted = model.IsMuted.Value; IsServerMuted = model.IsServerMuted.Value;
} }
internal void Update(API.PresenceMemberInfo model) internal void Update(API.PresenceMemberInfo model)
{ {
@@ -123,10 +123,10 @@ namespace Discord
} }
internal void Update(API.VoiceMemberInfo model) internal void Update(API.VoiceMemberInfo model)
{ {
if (model.IsDeafened != null) if (model.IsServerDeafened != null)
IsDeafened = model.IsDeafened.Value; IsServerDeafened = model.IsServerDeafened.Value;
if (model.IsMuted != null) if (model.IsServerMuted != null)
IsMuted = model.IsMuted.Value; IsServerMuted = model.IsServerMuted.Value;
if (model.SessionId != null) if (model.SessionId != null)
SessionId = model.SessionId; SessionId = model.SessionId;
if (model.Token != null) if (model.Token != null)
@@ -138,8 +138,8 @@ namespace Discord
IsSelfDeafened = model.IsSelfDeafened.Value; IsSelfDeafened = model.IsSelfDeafened.Value;
if (model.IsSelfMuted != null) if (model.IsSelfMuted != null)
IsSelfMuted = model.IsSelfMuted.Value; IsSelfMuted = model.IsSelfMuted.Value;
if (model.IsSuppressed != null) if (model.IsServerSuppressed != null)
IsSuppressed = model.IsSuppressed.Value; IsServerSuppressed = model.IsServerSuppressed.Value;
} }
internal void UpdateActivity(DateTime? activity = null) internal void UpdateActivity(DateTime? activity = null)