send notif when someone disconnects

2 files changed, 10 insertions, 16 deletions

diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs
index 9a7b786..0432be1 100644
--- a/mumd/src/network/tcp.rs
+++ b/mumd/src/network/tcp.rs
@@ -263,22 +263,7 @@ async fn listen(
                     info!("User {} connected to {}", user.name(), user.channel());
                 }
                 ControlPacket::UserRemove(msg) => {
-                    info!("User {} left", msg.get_session());
-                    state
-                        .lock()
-                        .unwrap()
-                        .audio_mut()
-                        .remove_client(msg.get_session());
-                    match state.lock().unwrap().server_mut().unwrap().users_mut().entry(msg.get_session()) {
-                        Entry::Occupied(o) => {
-                            o.remove_entry();
-                            info!("Removed entry");
-                        },
-                        Entry::Vacant(_) => {
-                            warn!("Tried to disconnect unknown user {}", msg.get_session());
-                        }
-                    }
-                    info!("{}", state.lock().unwrap().server().unwrap().users().contains_key(&msg.get_session()));
+                    state.lock().unwrap().remove_client(*msg);
                 }
                 ControlPacket::ChannelState(msg) => {
                     debug!("Channel state received");
diff --git a/mumd/src/state.rs b/mumd/src/state.rs
index 39221a3..85245a6 100644
--- a/mumd/src/state.rs
+++ b/mumd/src/state.rs
@@ -222,6 +222,7 @@ impl State {
                 // this is someone else
                 self.audio_mut().add_client(sess);
 
+                // send notification only if we've passed the connecting phase
                 if *self.phase_receiver().borrow() == StatePhase::Connected {
                     let channel_id = if msg.has_channel_id() {
                         msg.get_channel_id()
@@ -269,6 +270,14 @@ impl State {
             warn!("Tried to remove user state without session");
             return;
         }
+        if let Some(user) = self.server().unwrap().users().get(&msg.get_session()) {
+            libnotify::Notification::new("mumd",
+                                         Some(format!("{} disconnected",
+                                                      &user.name()).as_str()),
+                                         None)
+                .show().unwrap();
+        }
+
         self.audio().remove_client(msg.get_session());
         self.server_mut().unwrap().users_mut().remove(&msg.get_session());
         info!("User {} disconnected", msg.get_session());