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

Fixed guild member's joinedat reseting after certain events

Browse Source
This commit is contained in:
Sentinent
2017-01-05 01:44:41 -08:00
parent cf2596db58
commit a03269fcf1
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discord.Net.Rest/API/Common/GuildMember.cs
View File

@@ -13,7 +13,7 @@ namespace Discord.API
[JsonProperty("roles")] [JsonProperty("roles")]
public ulong[] Roles { get; set; } public ulong[] Roles { get; set; }
[JsonProperty("joined_at")] [JsonProperty("joined_at")]
public DateTimeOffset JoinedAt { get; set; } public Optional<DateTimeOffset> JoinedAt { get; set; }
[JsonProperty("deaf")] [JsonProperty("deaf")]
public bool Deaf { get; set; } public bool Deaf { get; set; }
[JsonProperty("mute")] [JsonProperty("mute")]

3
src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs
View File

@@ -47,7 +47,8 @@ namespace Discord.Rest
} }
internal void Update(Model model) internal void Update(Model model)
{ {
_joinedAtTicks = model.JoinedAt.UtcTicks; if (model.JoinedAt.IsSpecified)
_joinedAtTicks = model.JoinedAt.Value.UtcTicks;
if (model.Nick.IsSpecified) if (model.Nick.IsSpecified)
Nickname = model.Nick.Value; Nickname = model.Nick.Value;
IsDeafened = model.Deaf; IsDeafened = model.Deaf;

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

@@ -80,7 +80,8 @@ namespace Discord.WebSocket
internal void Update(ClientState state, Model model) internal void Update(ClientState state, Model model)
{ {
base.Update(state, model.User); base.Update(state, model.User);
_joinedAtTicks = model.JoinedAt.UtcTicks; if (model.JoinedAt.IsSpecified)
_joinedAtTicks = model.JoinedAt.Value.UtcTicks;
if (model.Nick.IsSpecified) if (model.Nick.IsSpecified)
Nickname = model.Nick.Value; Nickname = model.Nick.Value;
UpdateRoles(model.Roles); UpdateRoles(model.Roles);