diff options
Diffstat (limited to 'src/model/user.rs')
| -rw-r--r-- | src/model/user.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/model/user.rs b/src/model/user.rs index c3c3c0d..3ae33aa 100644 --- a/src/model/user.rs +++ b/src/model/user.rs @@ -573,19 +573,17 @@ impl User { // no-cache would warn on guild_id. pub fn has_role<G, R>(&self, guild: G, role: R) -> bool where G: Into<GuildContainer>, R: Into<RoleId> { - self._has_role(guild.into(), role.into()) - } + let role_id = role.into(); - fn _has_role(&self, guild: GuildContainer, role: RoleId) -> bool { - match guild { - GuildContainer::Guild(guild) => guild.roles.contains_key(&role), + match guild.into() { + GuildContainer::Guild(guild) => guild.roles.contains_key(&role_id), GuildContainer::Id(_guild_id) => { feature_cache! {{ CACHE.read() .unwrap() .guilds .get(&_guild_id) - .map(|g| g.read().unwrap().roles.contains_key(&role)) + .map(|g| g.read().unwrap().roles.contains_key(&role_id)) .unwrap_or(false) } else { true |