From d7b26608df94abb6ec8276fa6c8c9890247772c9 Mon Sep 17 00:00:00 2001 From: mountain Date: Tue, 11 Jul 2023 12:31:35 +0900 Subject: [PATCH] =?UTF-8?q?=ED=83=80=EC=9E=85=20=EB=AF=B8=EC=8A=A4?= =?UTF-8?q?=EB=A7=A4=EC=B9=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wshandler/wshandler.go | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/wshandler/wshandler.go b/wshandler/wshandler.go index 8233163..c51ebb4 100644 --- a/wshandler/wshandler.go +++ b/wshandler/wshandler.go @@ -322,19 +322,17 @@ func (sh *subhandler) mainLoop(ctx context.Context) { case *commandMessage: if usermsg.Cmd == commandType_JoinRoom && len(usermsg.Args) == 2 { - accid := usermsg.Args[0].(string) - roomName := usermsg.Args[1].(string) - - conn := entireConns[accid] + roomName := usermsg.Args[0].(string) + accid := usermsg.Args[1].(primitive.ObjectID) + conn := entireConns[accid.Hex()] if conn != nil { findRoom(roomName, true).in(conn) break } } else if usermsg.Cmd == commandType_LeaveRoom && len(usermsg.Args) == 2 { - accid := usermsg.Args[0].(string) - roomName := usermsg.Args[1].(string) - - conn := entireConns[accid] + roomName := usermsg.Args[0].(string) + accid := usermsg.Args[1].(primitive.ObjectID) + conn := entireConns[accid.Hex()] if conn != nil { if room := findRoom(roomName, false); room != nil { room.out(conn) @@ -376,18 +374,16 @@ func (sh *subhandler) mainLoop(ctx context.Context) { case *commandMessage: if usermsg.Cmd == commandType_JoinRoom && len(usermsg.Args) == 2 { - accid := usermsg.Args[0].(string) - roomName := usermsg.Args[1].(string) - - conn := entireConns[accid] + roomName := usermsg.Args[0].(string) + accid := usermsg.Args[1].(primitive.ObjectID) + conn := entireConns[accid.Hex()] if conn != nil { findRoom(roomName, true).in(conn) } } else if usermsg.Cmd == commandType_LeaveRoom && len(usermsg.Args) == 2 { - accid := usermsg.Args[0].(string) - roomName := usermsg.Args[1].(string) - - conn := entireConns[accid] + roomName := usermsg.Args[0].(string) + accid := usermsg.Args[1].(primitive.ObjectID) + conn := entireConns[accid.Hex()] if conn != nil { if room := findRoom(roomName, false); room != nil { room.out(conn)