1 files changed, 28 insertions, 28 deletions
diff --git a/src/betterttv.rs b/src/betterttv.rs
index 07dae2c..2d8134b 100644
--- a/src/betterttv.rs
+++ b/src/betterttv.rs
@@ -94,17 +94,40 @@ impl RetrieveEmoteAPI<BetterTTVEmote> for BetterTTVAPIClient {
     }
 }
 
-pub struct BetterTTVWSClient {
+pub struct BetterTTVWSClient<F>
+where
+    F: Fn(String, Option<String>, Emote),
+{
     url: String,
-    on_emote_create: Option<Box<dyn Fn(String, Option<String>, Emote) + Send + Sync>>,
-    on_emote_update: Option<Box<dyn Fn(String, Option<String>, Emote) + Send + Sync>>,
-    on_emote_delete: Option<Box<dyn Fn(String, Option<String>, Emote) + Send + Sync>>,
+    on_emote_create: Option<F>,
+    on_emote_update: Option<F>,
+    on_emote_delete: Option<F>,
 
     joined_channels: HashSet<usize>,
     awaiting_channels: HashSet<usize>,
 }
 
-impl BetterTTVWSClient {
+impl<F> RetrieveEmoteWS<Emote, F> for BetterTTVWSClient<F>
+where
+    F: Fn(String, Option<String>, Emote),
+{
+    fn on_emote_create(&mut self, func: F) {
+        self.on_emote_create = Some(func);
+    }
+
+    fn on_emote_update(&mut self, func: F) {
+        self.on_emote_update = Some(func);
+    }
+
+    fn on_emote_delete(&mut self, func: F) {
+        self.on_emote_delete = Some(func);
+    }
+}
+
+impl<F> BetterTTVWSClient<F>
+where
+    F: Fn(String, Option<String>, Emote),
+{
     pub async fn new() -> Result<(WebSocketStream<MaybeTlsStream<TcpStream>>, Self)> {
         let url = "wss://sockets.betterttv.net/ws";
 
@@ -259,26 +282,3 @@ impl BetterTTVWSClient {
         self.joined_channels.clear();
     }
 }
-
-impl RetrieveEmoteWS<Emote> for BetterTTVWSClient {
-    fn on_emote_create(
-        &mut self,
-        func: &'static (dyn Fn(String, Option<String>, Emote) + Send + Sync),
-    ) {
-        self.on_emote_create = Some(Box::new(func));
-    }
-
-    fn on_emote_update(
-        &mut self,
-        func: &'static (dyn Fn(String, Option<String>, Emote) + Send + Sync),
-    ) {
-        self.on_emote_update = Some(Box::new(func));
-    }
-
-    fn on_emote_delete(
-        &mut self,
-        func: &'static (dyn Fn(String, Option<String>, Emote) + Send + Sync),
-    ) {
-        self.on_emote_delete = Some(Box::new(func));
-    }
-}