diff --git a/src/Discord.Net.WebSocket/ClientState.cs b/src/Discord.Net.WebSocket/ClientState.cs
index 7129feb48..c40ae3f92 100644
--- a/src/Discord.Net.WebSocket/ClientState.cs
+++ b/src/Discord.Net.WebSocket/ClientState.cs
@@ -115,7 +115,7 @@ namespace Discord.WebSocket
if (_guilds.TryRemove(id, out SocketGuild guild))
{
guild.PurgeChannelCache(this);
- guild.PurgeGuildUserCache();
+ guild.PurgeUserCache();
return guild;
}
return null;
@@ -140,7 +140,7 @@ namespace Discord.WebSocket
internal void PurgeUsers()
{
foreach (var guild in _guilds.Values)
- guild.PurgeGuildUserCache();
+ guild.PurgeUserCache();
}
internal SocketApplicationCommand GetCommand(ulong id)
diff --git a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
index 03c655a34..697d5fe82 100644
--- a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
+++ b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
@@ -1144,22 +1144,29 @@ namespace Discord.WebSocket
}
return null;
}
- internal void PurgeGuildUserCache()
+
+ ///
+ /// Purges this guild's user cache.
+ ///
+ public void PurgeUserCache() => PurgeUserCache(_ => true);
+ ///
+ /// Purges this guild's user cache.
+ ///
+ /// The predicate used to select which users to clear.
+ public void PurgeUserCache(Func predicate)
{
- var members = Users;
- var self = CurrentUser;
- _members.Clear();
- if (self != null)
- _members.TryAdd(self.Id, self);
+ var membersToPurge = Users.Where(x => predicate.Invoke(x) && x?.Id != Discord.CurrentUser.Id);
+ var membersToKeep = Users.Where(x => !predicate.Invoke(x) || x?.Id == Discord.CurrentUser.Id);
+
+ foreach (var member in membersToPurge)
+ if(_members.TryRemove(member.Id, out _))
+ member.GlobalUser.RemoveRef(Discord);
+
+ foreach (var member in membersToKeep)
+ _members.TryAdd(member.Id, member);
_downloaderPromise = new TaskCompletionSource();
DownloadedMemberCount = _members.Count;
-
- foreach (var member in members)
- {
- if (member.Id != self?.Id)
- member.GlobalUser.RemoveRef(Discord);
- }
}
///