1 files changed, 27 insertions, 20 deletions
diff --git a/mumd/src/state.rs b/mumd/src/state.rs
index d12b5b6..d2d77b1 100644
--- a/mumd/src/state.rs
+++ b/mumd/src/state.rs
@@ -2,7 +2,7 @@ pub mod channel;
 pub mod server;
 pub mod user;
 
-use crate::audio::{AudioInput, AudioOutput, NotificationEvents};
+use crate::{audio::{AudioInput, AudioOutput, NotificationEvents}, network::tcp::DisconnectedReason};
 use crate::error::StateError;
 use crate::network::tcp::{TcpEvent, TcpEventData};
 use crate::network::{ConnectionInfo, VoiceStreamType};
@@ -27,8 +27,10 @@ use std::{
 use tokio::sync::{mpsc, watch};
 
 macro_rules! at {
-    ($event:expr, $generator:expr) => {
-        ExecutionContext::TcpEventCallback($event, Box::new($generator))
+    ( $( $event:expr => $generator:expr ),+ $(,)? ) => {
+        ExecutionContext::TcpEventCallback(vec![
+            $( ($event, Box::new($generator)), )*
+        ])
     };
 }
 
@@ -42,7 +44,7 @@ type Responses = Box<dyn Iterator<Item = mumlib::error::Result<Option<CommandRes
 
 //TODO give me a better name
 pub enum ExecutionContext {
-    TcpEventCallback(TcpEvent, Box<dyn FnOnce(TcpEventData) -> Responses>),
+    TcpEventCallback(Vec<(TcpEvent, Box<dyn FnOnce(TcpEventData) -> Responses>)>),
     TcpEventSubscriber(
         TcpEvent,
         Box<
@@ -606,23 +608,28 @@ pub fn handle_command(
                 )))
                 .unwrap();
             let state = Arc::clone(&og_state);
-            at!(TcpEvent::Connected, move |res| {
-                //runs the closure when the client is connected
-                if let TcpEventData::Connected(res) = res {
-                    Box::new(iter::once(res.map(|msg| {
-                        Some(CommandResponse::ServerConnect {
-                            welcome_message: if msg.has_welcome_text() {
-                                Some(msg.get_welcome_text().to_string())
-                            } else {
-                                None
-                            },
-                            server_state: state.read().unwrap().server.as_ref().unwrap().into(),
-                        })
-                    })))
-                } else {
-                    unreachable!("callback should be provided with a TcpEventData::Connected");
+            at!(
+                TcpEvent::Connected => move |res| {
+                    //runs the closure when the client is connected
+                    if let TcpEventData::Connected(res) = res {
+                        Box::new(iter::once(res.map(|msg| {
+                            Some(CommandResponse::ServerConnect {
+                                welcome_message: if msg.has_welcome_text() {
+                                    Some(msg.get_welcome_text().to_string())
+                                } else {
+                                    None
+                                },
+                                server_state: state.read().unwrap().server.as_ref().unwrap().into(),
+                            })
+                        })))
+                    } else {
+                        unreachable!("callback should be provided with a TcpEventData::Connected");
+                    }
+                },
+                TcpEvent::Disconnected(DisconnectedReason::InvalidTls) => |_| {
+                    Box::new(iter::once(Err(Error::ServerCertReject)))
                 }
-            })
+            )
         }
         Command::ServerDisconnect => {
             if !matches!(*state.phase_receiver().borrow(), StatePhase::Connected(_)) {