From 159496188b2c841a65829328cddafef620c517af Mon Sep 17 00:00:00 2001 From: Austin Hellyer Date: Sun, 8 Jan 2017 19:33:57 -0800 Subject: [PATCH] Simplify Reaction::delete() --- src/model/channel.rs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/model/channel.rs b/src/model/channel.rs index 4e1dfa6f7df..27fac25774f 100644 --- a/src/model/channel.rs +++ b/src/model/channel.rs @@ -1212,7 +1212,7 @@ impl Reaction { /// [permissions]: permissions #[cfg(feature="methods")] pub fn delete(&self) -> Result<()> { - feature_cache! {{ + let user_id = feature_cache! {{ let user = if self.user_id == CACHE.read().unwrap().user.id { None } else { @@ -1233,16 +1233,15 @@ impl Reaction { } } - rest::delete_reaction(self.channel_id.0, - self.message_id.0, - user, - self.emoji.clone()) + user } else { - rest::delete_reaction(self.channel_id.0, - self.message_id.0, - Some(self.user_id.0), - self.emoji.clone()) - }} + Some(self.user_id.0) + }}; + + rest::delete_reaction(self.channel_id.0, + self.message_id.0, + user_id, + self.emoji.clone()) } /// Retrieves the list of [`User`]s who have reacted to a [`Message`] with a