From de4dbe923b527c162af65f2e574ca3ce7be245c8 Mon Sep 17 00:00:00 2001 From: Daniel Baynton Date: Sat, 29 May 2021 10:57:43 +0100 Subject: [PATCH] Rename new method for consistency --- src/Discord.Net.WebSocket/ClientState.cs | 4 ++-- .../Entities/Guilds/SocketGuild.cs | 21 +++++++++---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/Discord.Net.WebSocket/ClientState.cs b/src/Discord.Net.WebSocket/ClientState.cs index f2e370d02..d806eed0d 100644 --- a/src/Discord.Net.WebSocket/ClientState.cs +++ b/src/Discord.Net.WebSocket/ClientState.cs @@ -112,7 +112,7 @@ namespace Discord.WebSocket if (_guilds.TryRemove(id, out SocketGuild guild)) { guild.PurgeChannelCache(this); - guild.PurgeGuildUserCache(); + guild.PurgeUserCache(); return guild; } return null; @@ -137,7 +137,7 @@ namespace Discord.WebSocket internal void PurgeUsers() { foreach (var guild in _guilds.Values) - guild.PurgeGuildUserCache(); + guild.PurgeUserCache(); } } } diff --git a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs index da3242fa3..60b9cde6c 100644 --- a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs +++ b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs @@ -821,15 +821,6 @@ namespace Discord.WebSocket /// public Task PruneUsersAsync(int days = 30, bool simulate = false, RequestOptions options = null, IEnumerable includeRoleIds = null) => GuildHelper.PruneUsersAsync(this, Discord, days, simulate, options, includeRoleIds); - /// - /// Clears this guild's user cache. - /// - public void ClearUserCache() => PurgeGuildUserCache(); - /// - /// Clears this guild's user cache. - /// - /// The predicate used to select which users to clear. - public void ClearUserCache(Func predicate) => PurgeGuildUserCache(predicate); internal SocketGuildUser AddOrUpdateUser(UserModel model) { if (_members.TryGetValue(model.Id, out SocketGuildUser member)) @@ -885,8 +876,16 @@ namespace Discord.WebSocket } return null; } - internal void PurgeGuildUserCache() => PurgeGuildUserCache(x => true); - internal void PurgeGuildUserCache(Func predicate) + + /// + /// 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 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);