Browse Source

fix thread member nre (#1977)

tags/3.1.0
Quin Lynch GitHub 3 years ago
parent
commit
5d43fe65b4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 23 deletions
  1. +0
    -6
      src/Discord.Net.Rest/API/Common/ThreadMember.cs
  2. +5
    -7
      src/Discord.Net.WebSocket/DiscordSocketClient.cs
  3. +0
    -10
      src/Discord.Net.WebSocket/Entities/Users/SocketThreadUser.cs

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

@@ -14,12 +14,6 @@ namespace Discord.API
[JsonProperty("join_timestamp")]
public DateTimeOffset JoinTimestamp { get; set; }

[JsonProperty("presence")]
public Optional<Presence> Presence { get; set; }

[JsonProperty("member")]
public Optional<GuildMember> Member { get; set; }

[JsonProperty("flags")]
public int Flags { get; set; } // No enum type (yet?)
}


+ 5
- 7
src/Discord.Net.WebSocket/DiscordSocketClient.cs View File

@@ -2529,16 +2529,14 @@ namespace Discord.WebSocket
{
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
{
guildMember = guild.GetUser(threadMember.UserId.Value);
}

newThreadMembers.Add(thread.AddOrUpdateThreadMember(threadMember, guildMember));
newThreadMembers.Add(thread.AddOrUpdateThreadMember(threadMember, guildMember));
}

if (newThreadMembers.Any())


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

@@ -137,16 +137,6 @@ namespace Discord.WebSocket
internal void Update(Model model)
{
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/>


Loading…
Cancel
Save