aboutsummaryrefslogtreecommitdiff
path: root/src/model/guild
diff options
context:
space:
mode:
authorLakelezz <[email protected]>2018-10-30 15:10:10 +0100
committerGitHub <[email protected]>2018-10-30 15:10:10 +0100
commit867a744720c46c0b04a2d34c2119ad366aa440ef (patch)
treeab9fd0708f2c4bafe3c554991bb2509c01f898ae /src/model/guild
parentFix cache write lock timer (#423) (diff)
downloadserenity-867a744720c46c0b04a2d34c2119ad366aa440ef.tar.xz
serenity-867a744720c46c0b04a2d34c2119ad366aa440ef.zip
Add Function to neutralise Mentions (#414)
Diffstat (limited to 'src/model/guild')
-rw-r--r--src/model/guild/role.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/model/guild/role.rs b/src/model/guild/role.rs
index ac969c0..53239a8 100644
--- a/src/model/guild/role.rs
+++ b/src/model/guild/role.rs
@@ -6,7 +6,7 @@ use builder::EditRole;
#[cfg(all(feature = "cache", feature = "model"))]
use internal::prelude::*;
#[cfg(all(feature = "cache", feature = "model"))]
-use {CACHE, http};
+use {CACHE, Cache, http};
#[cfg(all(feature = "cache", feature = "model", feature = "utils"))]
use std::str::FromStr;
@@ -182,9 +182,12 @@ impl RoleId {
/// [`Role`]: ../guild/struct.Role.html
#[cfg(feature = "cache")]
pub fn to_role_cached(self) -> Option<Role> {
- let cache = CACHE.read();
+ self._to_role_cached(&CACHE)
+ }
- for guild in cache.guilds.values() {
+ #[cfg(feature = "cache")]
+ pub(crate) fn _to_role_cached(self, cache: &RwLock<Cache>) -> Option<Role> {
+ for guild in cache.read().guilds.values() {
let guild = guild.read();
if !guild.roles.contains_key(&self) {