aboutsummaryrefslogtreecommitdiff
path: root/src/model/guild/member.rs
diff options
context:
space:
mode:
authoracdenisSK <[email protected]>2017-11-04 23:12:17 +0100
committeracdenisSK <[email protected]>2017-11-04 23:12:17 +0100
commit2032a402c387b1310f2ae62621f3e07c86b76aef (patch)
treee34c35de1eb517d9b2469f02cd179ab9e6b34544 /src/model/guild/member.rs
parentMerge v0.4.3 (diff)
downloadserenity-2032a402c387b1310f2ae62621f3e07c86b76aef.tar.xz
serenity-2032a402c387b1310f2ae62621f3e07c86b76aef.zip
Whoops. Add a `FromStr` impl for `ReactionType`
Diffstat (limited to 'src/model/guild/member.rs')
-rw-r--r--src/model/guild/member.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs
index e5feee7..2c31bc3 100644
--- a/src/model/guild/member.rs
+++ b/src/model/guild/member.rs
@@ -188,7 +188,7 @@ impl Member {
let reader = guild.read();
for (cid, channel) in &reader.channels {
- if reader.permissions_for(*cid, self.user.read().id).read_messages() {
+ if reader.permissions_in(*cid, self.user.read().id).read_messages() {
return Some(channel.clone());
}
}
@@ -311,9 +311,9 @@ impl Member {
None => return Err(From::from(ModelError::GuildNotFound)),
};
- let reader = guild.read().unwrap();
+ let reader = guild.read();
- Ok(reader.member_permissions(self.user.read().unwrap().id))
+ Ok(reader.member_permissions(self.user.read().id))
}
/// Removes a [`Role`] from the member, editing its roles in-place if the