Skip to content

Commit c343ce9

Browse files
authored
Guild member JoinedAt nullability (#3152)
* GuildMember.JoinedAt is nullable
1 parent f18c836 commit c343ce9

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/Discord.Net.Rest/API/Common/GuildMember.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ internal class GuildMember
1414
[JsonProperty("roles")]
1515
public Optional<ulong[]> Roles { get; set; }
1616
[JsonProperty("joined_at")]
17-
public Optional<DateTimeOffset> JoinedAt { get; set; }
17+
public Optional<DateTimeOffset?> JoinedAt { get; set; }
1818
[JsonProperty("deaf")]
1919
public Optional<bool> Deaf { get; set; }
2020
[JsonProperty("mute")]

src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ internal void Update(Model model)
109109
{
110110
base.Update(model.User);
111111
if (model.JoinedAt.IsSpecified)
112-
_joinedAtTicks = model.JoinedAt.Value.UtcTicks;
112+
_joinedAtTicks = model.JoinedAt.Value.GetValueOrDefault(DateTimeOffset.UtcNow).UtcTicks;
113113
if (model.Nick.IsSpecified)
114114
Nickname = model.Nick.Value;
115115
if (model.Avatar.IsSpecified)

src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ internal void Update(ClientState state, MemberModel model)
178178
{
179179
base.Update(state, model.User);
180180
if (model.JoinedAt.IsSpecified)
181-
_joinedAtTicks = model.JoinedAt.Value.UtcTicks;
181+
_joinedAtTicks = model.JoinedAt.Value.GetValueOrDefault(DateTimeOffset.UtcNow).UtcTicks;
182182
if (model.Nick.IsSpecified)
183183
Nickname = model.Nick.Value;
184184
if (model.Avatar.IsSpecified)

0 commit comments

Comments
 (0)