fix mute and deafen feature

1 files changed, 51 insertions, 33 deletions

diff --git a/mumd/src/state.rs b/mumd/src/state.rs
index 2cd3931..8fe5e36 100644
--- a/mumd/src/state.rs
+++ b/mumd/src/state.rs
@@ -238,25 +238,35 @@ impl State {
                     return now!(Err(Error::DisconnectedError));
                 }
 
-                let action = match toggle {
-                    Some(state) => {
-                        if self.server().unwrap().deafened() != state {
-                            Some(state)
-                        } else {
-                            None
-                        }
-                    }
-                    None => Some(!self.server().unwrap().deafened()),
+                let server = self.server_mut().unwrap();
+                let action = match (toggle, server.muted(), server.deafened()) {
+                    (Some(false), false, false) => None,
+                    (Some(false), false, true) => Some((false, false)),
+                    (Some(false), true, false) => None,
+                    (Some(false), true, true) => Some((true, false)),
+                    (Some(true), false, false) => Some((false, true)),
+                    (Some(true), false, true) => None,
+                    (Some(true), true, false) => Some((true, true)),
+                    (Some(true), true, true) => None,
+                    (None, false, false) => Some((false, true)),
+                    (None, false, true) => Some((false, false)),
+                    (None, true, false) => Some((true, true)),
+                    (None, true, true) => Some((true, false)),
                 };
 
-                if let Some(action) = action {
-                    if action {
-                        self.server_mut().unwrap().set_muted(true);
-                    }
+                if let Some((mute, deafen)) = action {
                     let mut msg = msgs::UserState::new();
-                    msg.set_self_deaf(action);
+                    if server.muted() != mute {
+                        msg.set_self_mute(mute);
+                    } else if !mute && !deafen && server.deafened() {
+                        msg.set_self_mute(false);
+                    }
+                    if server.deafened() != deafen {
+                        msg.set_self_deaf(deafen);
+                    }
+                    server.set_muted(mute);
+                    server.set_deafened(deafen);
                     self.packet_sender.send(msg.into()).unwrap();
-                    self.server_mut().unwrap().set_deafened(action);
                 }
 
                 now!(Ok(None))
@@ -266,25 +276,35 @@ impl State {
                     return now!(Err(Error::DisconnectedError));
                 }
 
-                let action = match toggle {
-                    Some(state) => {
-                        if self.server().unwrap().muted() != state {
-                            Some(state)
-                        } else {
-                            None
-                        }
-                    }
-                    None => Some(!self.server().unwrap().muted()),
+                let server = self.server_mut().unwrap();
+                let action = match (toggle, server.muted(), server.deafened()) {
+                    (Some(false), false, false) => None,
+                    (Some(false), false, true) => Some((false, false)),
+                    (Some(false), true, false) => Some((false, false)),
+                    (Some(false), true, true) => Some((false, false)),
+                    (Some(true), false, false) => Some((true, false)),
+                    (Some(true), false, true) => None,
+                    (Some(true), true, false) => None,
+                    (Some(true), true, true) => None,
+                    (None, false, false) => Some((true, false)),
+                    (None, false, true) => Some((false, false)),
+                    (None, true, false) => Some((false, false)),
+                    (None, true, true) => Some((false, false)),
                 };
 
-                if let Some(action) = action {
-                    if !action {
-                        self.server_mut().unwrap().set_deafened(false);
-                    }
+                if let Some((mute, deafen)) = action {
                     let mut msg = msgs::UserState::new();
-                    msg.set_self_mute(action);
+                    if server.muted() != mute {
+                        msg.set_self_mute(mute);
+                    } else if !mute && !deafen && server.deafened() {
+                        msg.set_self_mute(false);
+                    }
+                    if server.deafened() != deafen {
+                        msg.set_self_deaf(deafen);
+                    }
+                    server.set_muted(mute);
+                    server.set_deafened(deafen);
                     self.packet_sender.send(msg.into()).unwrap();
-                    self.server_mut().unwrap().set_muted(action);
                 }
 
                 now!(Ok(None))
@@ -431,8 +451,6 @@ impl State {
             None
         };
 
-        debug!("{:?} {:?} {:?}", mute, deaf, msg);
-
         let diff = UserDiff::from(msg);
         user.apply_user_diff(&diff);
         let user = self.server().unwrap().users().get(&session).unwrap();
@@ -450,7 +468,7 @@ impl State {
                 warn!("{} moved to invalid channel {}", &user.name(), channel_id);
             }
         }
-        
+
         //     send notification if a user muted/unmuted
         //TODO our channel only
         let notify_desc = match (mute, deaf) {