1 files changed, 28 insertions, 15 deletions
diff --git a/mumd/src/state.rs b/mumd/src/state.rs
index d2d77b1..1992884 100644
--- a/mumd/src/state.rs
+++ b/mumd/src/state.rs
@@ -20,6 +20,7 @@ use mumlib::command::{ChannelTarget, Command, CommandResponse, MessageTarget, Mu
 use mumlib::config::Config;
 use mumlib::Error;
 use std::{
+    fmt::Debug,
     iter,
     net::{SocketAddr, ToSocketAddrs},
     sync::{Arc, RwLock},
@@ -29,7 +30,7 @@ use tokio::sync::{mpsc, watch};
 macro_rules! at {
     ( $( $event:expr => $generator:expr ),+ $(,)? ) => {
         ExecutionContext::TcpEventCallback(vec![
-            $( ($event, Box::new($generator)), )*
+            $( ($event, Box::new($generator)), )+
         ])
     };
 }
@@ -42,18 +43,18 @@ macro_rules! now {
 
 type Responses = Box<dyn Iterator<Item = mumlib::error::Result<Option<CommandResponse>>>>;
 
+type TcpEventCallback = Box<dyn FnOnce(TcpEventData<'_>) -> Responses>;
+type TcpEventSubscriberCallback = Box<
+    dyn FnMut(
+        TcpEventData<'_>,
+        &mut mpsc::UnboundedSender<mumlib::error::Result<Option<CommandResponse>>>,
+    ) -> bool
+>;
+
 //TODO give me a better name
 pub enum ExecutionContext {
-    TcpEventCallback(Vec<(TcpEvent, Box<dyn FnOnce(TcpEventData) -> Responses>)>),
-    TcpEventSubscriber(
-        TcpEvent,
-        Box<
-            dyn FnMut(
-                TcpEventData,
-                &mut mpsc::UnboundedSender<mumlib::error::Result<Option<CommandResponse>>>,
-            ) -> bool,
-        >,
-    ),
+    TcpEventCallback(Vec<(TcpEvent, TcpEventCallback)>),
+    TcpEventSubscriber(TcpEvent, TcpEventSubscriberCallback),
     Now(Box<dyn FnOnce() -> Responses>),
     Ping(
         Box<dyn FnOnce() -> mumlib::error::Result<SocketAddr>>,
@@ -63,6 +64,17 @@ pub enum ExecutionContext {
     ),
 }
 
+impl Debug for ExecutionContext {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_tuple(match self {
+            ExecutionContext::TcpEventCallback(_) => "TcpEventCallback",
+            ExecutionContext::TcpEventSubscriber(_, _) => "TcpEventSubscriber",
+            ExecutionContext::Now(_) => "Now",
+            ExecutionContext::Ping(_, _) => "Ping",
+        }).finish()
+    }
+}
+
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum StatePhase {
     Disconnected,
@@ -70,6 +82,7 @@ pub enum StatePhase {
     Connected(VoiceStreamType),
 }
 
+#[derive(Debug)]
 pub struct State {
     config: Config,
     server: Option<Server>,
@@ -90,9 +103,9 @@ impl State {
             config.audio.input_volume.unwrap_or(1.0),
             phase_watcher.1.clone(),
         )
-        .map_err(|e| StateError::AudioError(e))?;
+        .map_err(StateError::AudioError)?;
         let audio_output = AudioOutput::new(config.audio.output_volume.unwrap_or(1.0))
-            .map_err(|e| StateError::AudioError(e))?;
+            .map_err(StateError::AudioError)?;
         let mut state = Self {
             config,
             server: None,
@@ -308,7 +321,7 @@ impl State {
     }
 
     pub fn initialized(&self) {
-        self.broadcast_phase(StatePhase::Connected(VoiceStreamType::TCP));
+        self.broadcast_phase(StatePhase::Connected(VoiceStreamType::Tcp));
         self.audio_output
             .play_effect(NotificationEvents::ServerConnect);
     }
@@ -773,7 +786,7 @@ pub fn handle_command(
                         .unwrap()
                         .users()
                         .iter()
-                        .find(|(_, user)| user.name() == &name)
+                        .find(|(_, user)| user.name() == name)
                         .map(|(e, _)| *e);
 
                     let id = match id {