fix thread member nre (#1977)
This commit is contained in:
@@ -14,12 +14,6 @@ namespace Discord.API
|
|||||||
[JsonProperty("join_timestamp")]
|
[JsonProperty("join_timestamp")]
|
||||||
public DateTimeOffset JoinTimestamp { get; set; }
|
public DateTimeOffset JoinTimestamp { get; set; }
|
||||||
|
|
||||||
[JsonProperty("presence")]
|
|
||||||
public Optional<Presence> Presence { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("member")]
|
|
||||||
public Optional<GuildMember> Member { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("flags")]
|
[JsonProperty("flags")]
|
||||||
public int Flags { get; set; } // No enum type (yet?)
|
public int Flags { get; set; } // No enum type (yet?)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2529,15 +2529,13 @@ namespace Discord.WebSocket
|
|||||||
{
|
{
|
||||||
SocketGuildUser guildMember;
|
SocketGuildUser guildMember;
|
||||||
|
|
||||||
if (threadMember.Member.IsSpecified)
|
guildMember = guild.GetUser(threadMember.UserId.Value);
|
||||||
|
|
||||||
|
if(guildMember == null)
|
||||||
{
|
{
|
||||||
guildMember = guild.AddOrUpdateUser(threadMember.Member.Value);
|
await UnknownGuildUserAsync("THREAD_MEMBERS_UPDATE", threadMember.UserId.Value, guild.Id);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
|
||||||
guildMember = guild.GetUser(threadMember.UserId.Value);
|
|
||||||
}
|
|
||||||
|
|
||||||
newThreadMembers.Add(thread.AddOrUpdateThreadMember(threadMember, guildMember));
|
newThreadMembers.Add(thread.AddOrUpdateThreadMember(threadMember, guildMember));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -137,16 +137,6 @@ namespace Discord.WebSocket
|
|||||||
internal void Update(Model model)
|
internal void Update(Model model)
|
||||||
{
|
{
|
||||||
ThreadJoinedAt = model.JoinTimestamp;
|
ThreadJoinedAt = model.JoinTimestamp;
|
||||||
|
|
||||||
if (model.Presence.IsSpecified)
|
|
||||||
{
|
|
||||||
GuildUser.Update(Discord.State, model.Presence.Value, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (model.Member.IsSpecified)
|
|
||||||
{
|
|
||||||
GuildUser.Update(Discord.State, model.Member.Value);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
|
|||||||
Reference in New Issue
Block a user