aboutsummaryrefslogtreecommitdiff
path: root/src/model/invite.rs
diff options
context:
space:
mode:
authorAustin Hellyer <[email protected]>2016-12-29 11:49:28 -0800
committerAustin Hellyer <[email protected]>2016-12-29 11:49:28 -0800
commitfa4952b30fec8f62c9882c2c9ef9836eae2cd9a9 (patch)
treecae13f61f6634183ff73c24703c66d57b6b1d8e8 /src/model/invite.rs
parentAdd user static avatar url methods (diff)
downloadserenity-fa4952b30fec8f62c9882c2c9ef9836eae2cd9a9.tar.xz
serenity-fa4952b30fec8f62c9882c2c9ef9836eae2cd9a9.zip
Use conditional blocks over macros
Diffstat (limited to 'src/model/invite.rs')
-rw-r--r--src/model/invite.rs20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/model/invite.rs b/src/model/invite.rs
index 4742b39..0d68ff0 100644
--- a/src/model/invite.rs
+++ b/src/model/invite.rs
@@ -32,11 +32,12 @@ impl Invite {
/// [permission]: permissions/index.html
#[cfg(feature="methods")]
pub fn accept(&self) -> Result<Invite> {
- feature_cache_enabled! {{
+ #[cfg(feature="cache")]
+ {
if CACHE.read().unwrap().user.bot {
return Err(Error::Client(ClientError::InvalidOperationAsBot));
}
- }}
+ }
rest::accept_invite(&self.code)
}
@@ -55,13 +56,14 @@ impl Invite {
/// [permission]: permissions/index.html
#[cfg(feature="methods")]
pub fn delete(&self) -> Result<Invite> {
- feature_cache_enabled! {{
+ #[cfg(feature="cache")]
+ {
let req = permissions::MANAGE_GUILD;
if !utils::user_has_perms(self.channel.id, req)? {
return Err(Error::Client(ClientError::InvalidPermissions(req)));
}
- }}
+ }
rest::delete_invite(&self.code)
}
@@ -89,11 +91,12 @@ impl RichInvite {
/// [`rest::accept_invite`]: ../client/rest/fn.accept_invite.html
#[cfg(feature="methods")]
pub fn accept(&self) -> Result<Invite> {
- feature_cache_enabled! {{
+ #[cfg(feature="cache")]
+ {
if CACHE.read().unwrap().user.bot {
return Err(Error::Client(ClientError::InvalidOperationAsBot));
}
- }}
+ }
rest::accept_invite(&self.code)
}
@@ -117,13 +120,14 @@ impl RichInvite {
/// [permission]: permissions/index.html
#[cfg(feature="methods")]
pub fn delete(&self) -> Result<Invite> {
- feature_cache_enabled! {{
+ #[cfg(feature="cache")]
+ {
let req = permissions::MANAGE_GUILD;
if !utils::user_has_perms(self.channel.id, req)? {
return Err(Error::Client(ClientError::InvalidPermissions(req)));
}
- }}
+ }
rest::delete_invite(&self.code)
}