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

fix: handle GUILD_DELETE behavior correctly (#1542)

Browse Source
This commit is contained in:
Paulo
2020-05-20 18:25:49 -03:00
committed by GitHub
parent 08d9834e2c
commit 91b270a0ce
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1771,17 +1771,7 @@ namespace Discord.WebSocket
return guild; return guild;
} }
internal SocketGuild RemoveGuild(ulong id) internal SocketGuild RemoveGuild(ulong id)
{ => State.RemoveGuild(id);
var guild = State.RemoveGuild(id);
if (guild != null)
{
foreach (var _ in guild.Channels)
State.RemoveChannel(id);
foreach (var user in guild.Users)
user.GlobalUser.RemoveRef(this);
}
return guild;
}
/// <exception cref="InvalidOperationException">Unexpected channel type is created.</exception> /// <exception cref="InvalidOperationException">Unexpected channel type is created.</exception>
internal ISocketPrivateChannel AddPrivateChannel(API.Channel model, ClientState state) internal ISocketPrivateChannel AddPrivateChannel(API.Channel model, ClientState state)

5
src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
View File

@@ -809,13 +809,14 @@ namespace Discord.WebSocket
var members = Users; var members = Users;
var self = CurrentUser; var self = CurrentUser;
_members.Clear(); _members.Clear();
_members.TryAdd(self.Id, self); if (self != null)
_members.TryAdd(self.Id, self);
DownloadedMemberCount = _members.Count; DownloadedMemberCount = _members.Count;
foreach (var member in members) foreach (var member in members)
{ {
if (member.Id != self.Id) if (member.Id != self?.Id)
member.GlobalUser.RemoveRef(Discord); member.GlobalUser.RemoveRef(Discord);
} }
} }