HMC/handmade-revolt-backend
6
0
Fork 0
forked from jmug/stoatchat
Code Pull Requests Actions Packages Releases 2 Activity

fix: prevent potential double fetching of cached server

Browse Source
This commit is contained in:
Paul Makles
2023-10-28 14:53:12 +01:00
parent cb813e91f0
commit b90e7a4412
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/core/database/src/util/permissions.rs
View File

@@ -344,7 +344,23 @@ impl PermissionQuery for DatabasePermissionQuery<'_> {
| Cow::Owned(Channel::TextChannel { server, .. }) | Cow::Owned(Channel::TextChannel { server, .. })
| Cow::Borrowed(Channel::VoiceChannel { server, .. }) | Cow::Borrowed(Channel::VoiceChannel { server, .. })
| Cow::Owned(Channel::VoiceChannel { server, .. }) => { | Cow::Owned(Channel::VoiceChannel { server, .. }) => {
// FIXME: may double fetch if let Some(known_server) =
// I'm not sure why I can't just pattern match both at once here?
// It throws some weird error and the provided fix doesn't work :/
if let Some(Cow::Borrowed(known_server)) = self.server {
Some(known_server)
} else if let Some(Cow::Owned(ref known_server)) = self.server {
Some(known_server)
} else {
None
}
{
if server == &known_server.id {
// Already cached, return early.
return;
}
}
if let Ok(server) = self.database.fetch_server(server).await { if let Ok(server) = self.database.fetch_server(server).await {
self.server.replace(Cow::Owned(server)); self.server.replace(Cow::Owned(server));
} }