diff options
| author | Zeyla Hellyer <[email protected]> | 2018-01-06 15:04:25 -0800 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2018-01-06 15:04:25 -0800 |
| commit | 0b91c3bf51698a196d69530df3f592e645d9131c (patch) | |
| tree | 49879f79906db263691fc57442f46a798ea6a271 /src | |
| parent | Add some role position hierarchy checks (diff) | |
| download | serenity-0b91c3bf51698a196d69530df3f592e645d9131c.tar.xz serenity-0b91c3bf51698a196d69530df3f592e645d9131c.zip | |
Fix compilation
Diffstat (limited to 'src')
| -rw-r--r-- | src/model/guild/member.rs | 9 | ||||
| -rw-r--r-- | src/model/guild/mod.rs | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs index b93349e..3b0147b 100644 --- a/src/model/guild/member.rs +++ b/src/model/guild/member.rs @@ -311,16 +311,15 @@ impl Member { { let cache = CACHE.read(); - if let Some(guild) = self.guilds.get(&self.guild_id) { + if let Some(guild) = cache.guilds.get(&self.guild_id) { + let req = Permissions::KICK_MEMBERS; let reader = guild.read(); - if !guild.has_perms(req) { - let req = Permissions::KICK_MEMBERS; - + if !reader.has_perms(req) { return Err(Error::Model(ModelError::InvalidPermissions(req))); } - guild.check_hierarchy(&self.user.read().id)?; + reader.check_hierarchy(self.user.read().id)?; } } diff --git a/src/model/guild/mod.rs b/src/model/guild/mod.rs index c74b4b2..d6cd75d 100644 --- a/src/model/guild/mod.rs +++ b/src/model/guild/mod.rs @@ -148,7 +148,7 @@ impl Guild { fn check_hierarchy(&self, other_user: UserId) -> Result<()> { let current_id = CACHE.read().user.id; - if let Some(higher) = self.greater_member_hierarchy(user, current_id) { + if let Some(higher) = self.greater_member_hierarchy(other_user, current_id) { if higher != current_id { return Err(Error::Model(ModelError::Hierarchy)); } |