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

fix thread member nre (#1977)

Browse Source
This commit is contained in:
Quin Lynch
2021-12-20 10:59:56 -04:00
committed by GitHub
parent 768a0a90b6
commit 5d43fe65b4
3 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Discord.Net.Rest/API/Common/ThreadMember.cs
View File

@@ -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?)
} }

12
src/Discord.Net.WebSocket/DiscordSocketClient.cs
View File

@@ -2529,16 +2529,14 @@ 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
{ newThreadMembers.Add(thread.AddOrUpdateThreadMember(threadMember, guildMember));
guildMember = guild.GetUser(threadMember.UserId.Value);
}
newThreadMembers.Add(thread.AddOrUpdateThreadMember(threadMember, guildMember));
} }
if (newThreadMembers.Any()) if (newThreadMembers.Any())

10
src/Discord.Net.WebSocket/Entities/Users/SocketThreadUser.cs
View File

@@ -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/>