From 631a39aecacf6e62ddc13ad4c8f3c81a0f5f49c7 Mon Sep 17 00:00:00 2001
From: Melonai <einebeere@gmail.com>
Date: Thu, 3 Jun 2021 15:37:52 +0200
Subject: Remove circular channel dependency

---
 assets/src/network/channel/messages/handler.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'assets/src/network/channel/messages/handler.ts')

diff --git a/assets/src/network/channel/messages/handler.ts b/assets/src/network/channel/messages/handler.ts
index 5cfe327..f7a00d2 100644
--- a/assets/src/network/channel/messages/handler.ts
+++ b/assets/src/network/channel/messages/handler.ts
@@ -20,6 +20,7 @@ export type UnregisterHandler = () => void;
 
 export function registerTokenHandler<Message extends AnyMessage>(
     handlers: Handlers,
+    channel: Channel,
     event: string,
     token: string | null,
     handler: Handler<Message>
@@ -35,7 +36,7 @@ export function registerTokenHandler<Message extends AnyMessage>(
 
         handlers[event] = eventHandler;
 
-        registerNewEvent<Message>(eventHandler, event);
+        registerNewEvent<Message>(channel, eventHandler, event);
     }
 
     let unregister: UnregisterHandler;
@@ -61,6 +62,7 @@ export function registerTokenHandler<Message extends AnyMessage>(
 }
 
 function registerNewEvent<Message extends AnyMessage>(
+    channel: Channel,
     eventHandler: EventHandler<Message>,
     event: string
 ) {
@@ -68,7 +70,7 @@ function registerNewEvent<Message extends AnyMessage>(
         handleEvent<Message>(eventHandler, data);
     };
 
-    getChannel().on(event, callback);
+    channel.on(event, callback);
 }
 
 function handleEvent<Message extends AnyMessage>(
-- 
cgit 1.4.1