From 88311881375bcd025072315878199fc5d3cccd85 Mon Sep 17 00:00:00 2001
From: Hri7566 <hri7566@gmail.com>
Date: Sun, 10 Sep 2023 06:50:17 -0400
Subject: [PATCH] ?

---
 src/channel/Channel.ts           |  2 +-
 src/ws/Socket.ts                 | 15 +++++++--------
 src/ws/events/user/handlers/a.ts |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/channel/Channel.ts b/src/channel/Channel.ts
index 9a4c950..3c943e5 100644
--- a/src/channel/Channel.ts
+++ b/src/channel/Channel.ts
@@ -293,7 +293,7 @@ export class Channel extends EventEmitter {
             }
         });
 
-        this.on("a", (msg: ServerEvents["a"], socket: Socket) => {
+        this.on("message", (msg: ServerEvents["a"], socket: Socket) => {
             if (!msg.message) return;
 
             let outgoing: ClientEvents["a"] = {
diff --git a/src/ws/Socket.ts b/src/ws/Socket.ts
index e0727ac..c369908 100644
--- a/src/ws/Socket.ts
+++ b/src/ws/Socket.ts
@@ -106,21 +106,20 @@ export class Socket extends EventEmitter {
         this.desiredChannel.set = set;
 
         let channel;
-        try {
-            for (const ch of channelList.values()) {
-                if (ch.getID() == this.desiredChannel._id) {
-                    channel = ch;
-                    break;
-                }
+        for (const ch of channelList) {
+            if (ch.getID() == _id) {
+                channel = ch;
             }
-        } catch (err) {}
+        }
+
+        logger.debug("Found channel:", channel);
 
         // Does channel exist?
         if (channel) {
             // Exists, join normally
             channel.join(this);
         } else {
-            // Doesn't exist, join with crown
+            // Doesn't exist, create
             channel = new Channel(
                 this.desiredChannel._id,
                 this.desiredChannel.set
diff --git a/src/ws/events/user/handlers/a.ts b/src/ws/events/user/handlers/a.ts
index 6668a71..a25d544 100644
--- a/src/ws/events/user/handlers/a.ts
+++ b/src/ws/events/user/handlers/a.ts
@@ -7,6 +7,6 @@ export const a: ServerEventListener<"a"> = {
         const ch = socket.getCurrentChannel();
         if (!ch) return;
 
-        ch.emit("a", msg, socket);
+        ch.emit("message", msg, socket);
     }
 };