Fix has_role returning an incorrect result if the member is not cac…

…hed (#725)
serenity-rs · Sep 27, 2019 · 96b49f9 · 96b49f9
1 parent d427da4
commit 96b49f9
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/model/user.rs b/src/model/user.rs
@@ -683,15 +683,13 @@ impl User {
                 #[cfg(feature = "cache")]
                 {
                     if let Some(cache) = cache_http.cache() {
-                        has_role = Some(
-                            cache.read()
+                        has_role = cache.read()
                             .guilds
                             .get(&guild_id)
-                            .map_or(false, |g| {
+                            .and_then(|g| {
                                 g.read().members.get(&self.id)
-                                    .map_or(false, |m| m.roles.contains(&role))
-                            })
-                        );
+                                    .and_then(|m| Some(m.roles.contains(&role)))
+                            });
                     }
                 }