Add ability to play DCA and Opus files. (#148)

1 files changed, 16 insertions, 19 deletions

diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs
index 370f555..f1a5114 100644
--- a/src/model/guild/member.rs
+++ b/src/model/guild/member.rs
@@ -168,10 +168,9 @@ impl Member {
 
         let default = Colour::default();
 
-        roles
-            .iter()
-            .find(|r| r.colour.0 != default.0)
-            .map(|r| r.colour)
+        roles.iter().find(|r| r.colour.0 != default.0).map(
+            |r| r.colour,
+        )
     }
 
     /// Calculates the member's display name.
@@ -179,10 +178,9 @@ impl Member {
     /// The nickname takes priority over the member's username if it exists.
     #[inline]
     pub fn display_name(&self) -> Cow<String> {
-        self.nick
-            .as_ref()
-            .map(Cow::Borrowed)
-            .unwrap_or_else(|| Cow::Owned(self.user.read().unwrap().name.clone()))
+        self.nick.as_ref().map(Cow::Borrowed).unwrap_or_else(|| {
+            Cow::Owned(self.user.read().unwrap().name.clone())
+        })
     }
 
     /// Returns the DiscordTag of a Member, taking possible nickname into account.
@@ -204,7 +202,7 @@ impl Member {
     /// [`Guild::edit_member`]: ../model/struct.Guild.html#method.edit_member
     /// [`EditMember`]: ../builder/struct.EditMember.html
     #[cfg(feature = "cache")]
-pub fn edit<F: FnOnce(EditMember) -> EditMember>(&self, f: F) -> Result<()>{
+    pub fn edit<F: FnOnce(EditMember) -> EditMember>(&self, f: F) -> Result<()> {
         let map = f(EditMember::default()).0;
 
         http::edit_member(self.guild_id.0, self.user.read().unwrap().id.0, &map)
@@ -248,12 +246,11 @@ pub fn edit<F: FnOnce(EditMember) -> EditMember>(&self, f: F) -> Result<()>{
         {
             let req = permissions::KICK_MEMBERS;
 
-            let has_perms = CACHE
-                .read()
-                .unwrap()
-                .guilds
-                .get(&self.guild_id)
-                .map(|guild| guild.read().unwrap().has_perms(req));
+            let has_perms = CACHE.read().unwrap().guilds.get(&self.guild_id).map(
+                |guild| {
+                    guild.read().unwrap().has_perms(req)
+                },
+            );
 
             if let Some(Ok(false)) = has_perms {
                 return Err(Error::Model(ModelError::InvalidPermissions(req)));
@@ -288,10 +285,10 @@ pub fn edit<F: FnOnce(EditMember) -> EditMember>(&self, f: F) -> Result<()>{
 
         let guild = guild.read().unwrap();
 
-        Ok(
-            guild
-                .permissions_for(ChannelId(guild.id.0), self.user.read().unwrap().id),
-        )
+        Ok(guild.permissions_for(
+            ChannelId(guild.id.0),
+            self.user.read().unwrap().id,
+        ))
     }
 
     /// Removes a [`Role`] from the member, editing its roles in-place if the